From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 34B5F3858D1E; Sun, 12 Feb 2023 15:06:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 34B5F3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676214398; bh=ZNQMJyCBHgLY1Gv+7aHytG9QBLwQnmiAO0IemGfAiR4=; h=From:To:Subject:Date:From; b=lowSOcdnY4cVTCAeMq2c1UWrpWenA5JRtC5XKv7lYrC9WjVRm3F6OuTeABcCqgjjK J1/etR0ddnanANBGZv+f7wEoblcEWYRMtAu0abKmhkiB5xn3nFN4/7nY/eBwiKsf1F 7XfvxRHfgpH7E9dupaDBkF26yA0wSCbzd7+Y+WPU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: Look for mach_i386.defs on x86_64 too X-Act-Checkin: glibc X-Git-Author: Sergey Bugaev X-Git-Refname: refs/heads/master X-Git-Oldrev: 3d008a92a816d4fcf07701f2d28dd8d6f9244b3b X-Git-Newrev: 4fedebc9110809b5965e42f659d3477f4c89def8 Message-Id: <20230212150638.34B5F3858D1E@sourceware.org> Date: Sun, 12 Feb 2023 15:06:38 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4fedebc9110809b5965e42f659d3477f4c89def8 commit 4fedebc9110809b5965e42f659d3477f4c89def8 Author: Sergey Bugaev Date: Sun Feb 12 14:10:40 2023 +0300 mach: Look for mach_i386.defs on x86_64 too Signed-off-by: Sergey Bugaev Message-Id: <20230212111044.610942-10-bugaevc@gmail.com> Diff: --- sysdeps/mach/configure | 6 +++--- sysdeps/mach/configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 3f0a90299f..8c341d59dc 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 +#include _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 +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index a57cb259b3..579c0021d5 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