From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id 8DEF43858428 for ; Sun, 12 Feb 2023 11:11:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8DEF43858428 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x532.google.com with SMTP id d40so8174967eda.8 for ; Sun, 12 Feb 2023 03:11:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=usGMy3laSiZa2ZRDDACVVxwiU/H6G/Kf/W73xUU5Wyg=; b=l6EAaEVVNkgAmCHmhpTzgOBGUcKNloPc2GJtkPftJoqyDbnL+nWqHtogX5nkhL5/KF oWaP7XNAXcIdXez4G7QjWaWZBheGaoXEQ+c7BJ/taHhXy2D21esTtZ5nFd/aAKA8qntq RhegUQoAUsrjJLKjCs82vr+j8JrZFUPnBqP6KrklTsqCNSluXgGfsSQQFCk6bZhZ6m+G Rs0ZzzVJJAVW1AJPIm0begDx5yiVWo7eXmxjTxRdUlOZ9sp9VRpYp7s4/evLfOJ7Y9Hr N1F91ccF6RcoHJPkZCx5suYfknp85YNLKhz85uAgU1yV1949lP7WCWs0NkFoZYHyLJxr Yhtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=usGMy3laSiZa2ZRDDACVVxwiU/H6G/Kf/W73xUU5Wyg=; b=5U7sowtlkDO7eqBuj2aOOVaQ/UZPKCz1p1kD9VvBQItzVV5K+/wXZIA85seOChpfO0 l31587EBUgkFUAe4d1fJ0TvYZc3cqNQ+l6TNp1zTYRrxOQ8BBBNdrvlFr5F1ciyX+vk1 StTMx4hRoM8LyYemwHGLPcm2iLitxmxJEsxLRaoueXiZd0RWOwQ/mesrqk2GR4tdU6nw mopB6jR5CxFSgd2NUs0LIqQe7RVGl6di6njUj2h+BCH7vhT5mOxHVJ9trijvEjGkkuiE 8QeaLViJ6Ul6+PB04iNZpXBmcLcuqA6Y136g/eSsMAwiKOyXwbn73j/p41n7U6eX7WIQ MApQ== X-Gm-Message-State: AO0yUKVV2NCUUmMEAtN4rUr2w5W/n9acMmphhdWrfVZeGbP8Z7F6ZvQm CYPnf91GKEg9K92BztxwFJ4= X-Google-Smtp-Source: AK7set8sIZ0zjc6lnxEZdXsFqwJr/C7gf1TuZZmzZ5XmCWNwJ+4hVqaFmfJHPxgvmoc6peBYNn/h2Q== X-Received: by 2002:a50:c345:0:b0:4ab:d0de:f7f0 with SMTP id q5-20020a50c345000000b004abd0def7f0mr6487381edb.5.1676200282406; Sun, 12 Feb 2023 03:11:22 -0800 (PST) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:2186:c463:9ced:e6fe]) by smtp.gmail.com with ESMTPSA id c61-20020a509fc3000000b004acbe0b36d2sm1266910edf.6.2023.02.12.03.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 03:11:22 -0800 (PST) From: Sergey Bugaev To: bug-hurd@gnu.org, libc-alpha@sourceware.org Cc: =?UTF-8?q?Fl=C3=A1vio=20Cruz?= , Sergey Bugaev Subject: [RFC PATCH glibc 9/12] mach: Look for mach_i386.defs on x86_64 too Date: Sun, 12 Feb 2023 14:10:40 +0300 Message-Id: <20230212111044.610942-10-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230212111044.610942-1-bugaevc@gmail.com> References: <20230212111044.610942-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Signed-off-by: Sergey Bugaev --- 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)) # Define mach-syscalls and sysno-*. ifndef inhibit_mach_syscalls diff --git a/sysdeps/mach/configure 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 +#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 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