hurd: Move some i386 bits to x86

As they will actually be usable on x86_64 too.

4 files changed, 2 insertions, 130 deletions

diff --git a/sysdeps/mach/i386/Implies b/sysdeps/mach/i386/Implies
new file mode 100644
index 0000000000..da8291f4c8
--- /dev/null
+++ b/sysdeps/mach/i386/Implies
@@ -0,0 +1 @@
+mach/x86
diff --git a/sysdeps/mach/i386/bits/mach/param.h b/sysdeps/mach/i386/bits/mach/param.h
deleted file mode 100644
index 4d3ec5da36..0000000000
--- a/sysdeps/mach/i386/bits/mach/param.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Old-style Unix parameters and limits.  i386 Mach version.
-   Copyright (C) 1993-2023 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/>.  */
-
-#ifndef _SYS_PARAM_H
-# error "Never use <bits/mach/param.h> directly; include <sys/param.h> instead."
-#endif
-
-#ifndef EXEC_PAGESIZE
-#define EXEC_PAGESIZE	4096
-#endif
diff --git a/sysdeps/mach/i386/machine-lock.h b/sysdeps/mach/i386/machine-lock.h
deleted file mode 100644
index 53d2c95c40..0000000000
--- a/sysdeps/mach/i386/machine-lock.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Machine-specific definition for spin locks.  i386 version.
-   Copyright (C) 1994-2023 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/>.  */
-
-#ifndef _MACHINE_LOCK_H
-#define	_MACHINE_LOCK_H
-
-/* The type of a spin lock variable.  */
-
-typedef volatile int __spin_lock_t;
-
-/* Value to initialize `__spin_lock_t' variables to.  */
-
-#define	__SPIN_LOCK_INITIALIZER	0
-
-
-#ifndef _EXTERN_INLINE
-#define _EXTERN_INLINE __extern_inline
-#endif
-
-/* Unlock LOCK.  */
-
-extern void __spin_unlock (__spin_lock_t *__lock);
-
-#if defined __USE_EXTERN_INLINES && defined _LIBC
-_EXTERN_INLINE void
-__spin_unlock (__spin_lock_t *__lock)
-{
-   register int __unlocked;
-   __asm__ __volatile ("xchgl %0, %1"
-		       : "=&r" (__unlocked), "=m" (*__lock) : "0" (0)
-		       : "memory");
-}
-#endif
-
-/* Try to lock LOCK; return nonzero if we locked it, zero if another has.  */
-
-extern int __spin_try_lock (__spin_lock_t *__lock);
-
-#if defined __USE_EXTERN_INLINES && defined _LIBC
-_EXTERN_INLINE int
-__spin_try_lock (__spin_lock_t *__lock)
-{
-  register int __locked;
-  __asm__ __volatile ("xchgl %0, %1"
-		      : "=&r" (__locked), "=m" (*__lock) : "0" (1)
-		      : "memory");
-  return !__locked;
-}
-#endif
-
-/* Return nonzero if LOCK is locked.  */
-
-extern int __spin_lock_locked (__spin_lock_t *__lock);
-
-#if defined __USE_EXTERN_INLINES && defined _LIBC
-_EXTERN_INLINE int
-__spin_lock_locked (__spin_lock_t *__lock)
-{
-  return *__lock != 0;
-}
-#endif
-
-
-#endif /* machine-lock.h */
diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h
index 19eab418a7..33bd5ee402 100644
--- a/sysdeps/mach/i386/sysdep.h
+++ b/sysdeps/mach/i386/sysdep.h
@@ -19,37 +19,12 @@
 #ifndef _MACH_I386_SYSDEP_H
 #define _MACH_I386_SYSDEP_H 1
 
-/* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO.  */
-#include <dl-sysdep.h>
-#include <tls.h>
-
-#define LOSE asm volatile ("hlt")
-
-#define SNARF_ARGS(entry_sp, argc, argv, envp)				      \
-  do									      \
-    {									      \
-      char **p;								      \
-      argc = (int) *entry_sp;						      \
-      argv = (char **) (entry_sp + 1);					      \
-      p = argv;								      \
-      while (*p++ != NULL)						      \
-	;								      \
-      if (p >= (char **) argv[0])					      \
-	--p;								      \
-      envp = p;							      \
-    } while (0)
+#include <sysdeps/mach/x86/sysdep.h>
 
 #define RETURN_TO(sp, pc, retval) \
   asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \
 		: : "g" (sp), "r" (pc), "a" (retval))
 
-
-#define STACK_GROWTH_DOWN
-
-/* Get the machine-independent Mach definitions.  */
-#include <sysdeps/mach/sysdep.h>
-
-
 /* This should be rearranged, but at the moment this file provides
    the most useful definitions for assembler syntax details.  */
 #undef ENTRY