Sergey Bugaev, le dim. 12 févr. 2023 14:10:40 +0300, a ecrit: > Signed-off-by: Sergey Bugaev <buga...@gmail.com> > --- > mach/Makefile | 3 ++- > sysdeps/mach/configure | 6 +++--- > sysdeps/mach/configure.ac | 6 +++--- > 3 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/mach/Makefile b/mach/Makefile > index 39358fdb..f2fdd7da 100644 > --- a/mach/Makefile > +++ b/mach/Makefile > @@ -64,7 +64,8 @@ CFLAGS-RPC_i386_set_ldt.o = $(no-stack-protector) > CFLAGS-RPC_task_get_special_port.o = $(no-stack-protector) > > # Translate GNU names for CPUs into the names used in Mach header files. > -mach-machine = $(patsubst powerpc,ppc,$(base-machine)) > +mach-machine := $(patsubst powerpc,ppc,$(base-machine)) > +mach-machine := $(patsubst x86_64,i386,$(mach-machine))
Mmm, no, it's not actually a translation. What exactly does this fix? To build a 64bit glibc, we'll use headers installed by a 64bit gnumach, i.e. into /usr/include/x86_64-gnu/ I have applied the rest, thanks! Samuel > diff --git a/sysdeps/mach/con b/sysdeps/mach/configure > index 3f0a9029..8c341d59 100644 > --- a/sysdeps/mach/configure > +++ b/sysdeps/mach/configure > @@ -249,7 +249,7 @@ for ifc in mach mach4 gnumach \ > clock clock_priv host_priv host_security ledger lock_set \ > processor processor_set task task_notify thread_act vm_map \ > memory_object memory_object_default default_pager \ > - i386/mach_i386 \ > + machine/mach_i386 \ > ; do > as_ac_Header=`$as_echo "ac_cv_header_mach/${ifc}.defs" | $as_tr_sh` > ac_fn_c_check_header_preproc "$LINENO" "mach/${ifc}.defs" "$as_ac_Header" > @@ -440,7 +440,7 @@ if ${libc_cv_mach_i386_ioports+:} false; then : > else > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > -#include <mach/i386/mach_i386.defs> > +#include <mach/machine/mach_i386.defs> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > @@ -466,7 +466,7 @@ if ${libc_cv_mach_i386_gdt+:} false; then : > else > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > -#include <mach/i386/mach_i386.defs> > +#include <mach/machine/mach_i386.defs> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac > index a57cb259..579c0021 100644 > --- a/sysdeps/mach/configure.ac > +++ b/sysdeps/mach/configure.ac > @@ -64,7 +64,7 @@ for ifc in mach mach4 gnumach \ > clock clock_priv host_priv host_security ledger lock_set \ > processor processor_set task task_notify thread_act vm_map \ > memory_object memory_object_default default_pager \ > - i386/mach_i386 \ > + machine/mach_i386 \ > ; do > AC_CHECK_HEADER(mach/${ifc}.defs, [dnl > mach_interface_list="$mach_interface_list $ifc"],, -) > @@ -89,7 +89,7 @@ AC_CHECK_HEADER(machine/ndr_def.h, [dnl > > AC_CACHE_CHECK(for i386_io_perm_modify in mach_i386.defs, > libc_cv_mach_i386_ioports, [dnl > -AC_EGREP_HEADER(i386_io_perm_modify, mach/i386/mach_i386.defs, > +AC_EGREP_HEADER(i386_io_perm_modify, mach/machine/mach_i386.defs, > libc_cv_mach_i386_ioports=yes, > libc_cv_mach_i386_ioports=no)]) > if test $libc_cv_mach_i386_ioports = yes; then > @@ -98,7 +98,7 @@ fi > > AC_CACHE_CHECK(for i386_set_gdt in mach_i386.defs, > libc_cv_mach_i386_gdt, [dnl > -AC_EGREP_HEADER(i386_set_gdt, mach/i386/mach_i386.defs, > +AC_EGREP_HEADER(i386_set_gdt, mach/machine/mach_i386.defs, > libc_cv_mach_i386_gdt=yes, > libc_cv_mach_i386_gdt=no)]) > if test $libc_cv_mach_i386_gdt = yes; then > -- > 2.39.1 > > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.