diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips/sys')
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/procfs.h | 7 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/ptrace.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/tas.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/ucontext.h | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/user.h | 8 |
5 files changed, 12 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/sys/procfs.h b/sysdeps/unix/sysv/linux/mips/sys/procfs.h index cb84677175..2bf07be3e9 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/procfs.h +++ b/sysdeps/unix/sysv/linux/mips/sys/procfs.h @@ -25,6 +25,7 @@ used on Linux. */ #include <features.h> +#include <sgidefs.h> #include <sys/time.h> #include <sys/types.h> #include <sys/user.h> @@ -34,7 +35,7 @@ #define ELF_NGREG 45 #define ELF_NFPREG 33 -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 __extension__ typedef unsigned long long elf_greg_t; #else typedef unsigned long elf_greg_t; @@ -65,7 +66,7 @@ struct elf_prstatus { struct elf_siginfo pr_info; /* Info associated with signal. */ short int pr_cursig; /* Current signal. */ -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 __extension__ unsigned long long int pr_sigpend; __extension__ unsigned long long int pr_sighold; #else @@ -93,7 +94,7 @@ struct elf_prpsinfo char pr_sname; /* Char for pr_state. */ char pr_zomb; /* Zombie. */ char pr_nice; /* Nice val. */ -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 __extension__ unsigned long long int pr_flag; #else unsigned long int pr_flag; /* Flags. */ diff --git a/sysdeps/unix/sysv/linux/mips/sys/ptrace.h b/sysdeps/unix/sysv/linux/mips/sys/ptrace.h index 9badeb3a82..d05853da77 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/mips/sys/ptrace.h @@ -124,7 +124,7 @@ enum __ptrace_request appear (those that are used for the particular request) as: pid_t PID, void *ADDR, int DATA, void *ADDR2 after REQUEST. */ -#if _MIPS_SIM == _MIPS_SIM_NABI32 +#if _MIPS_SIM == _ABIN32 __extension__ extern long long int ptrace (enum __ptrace_request __request, ...) __THROW; #else diff --git a/sysdeps/unix/sysv/linux/mips/sys/tas.h b/sysdeps/unix/sysv/linux/mips/sys/tas.h index 006e1614c7..e5180f9475 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/tas.h +++ b/sysdeps/unix/sysv/linux/mips/sys/tas.h @@ -21,7 +21,6 @@ #define _SYS_TAS_H 1 #include <features.h> - #include <sgidefs.h> __BEGIN_DECLS @@ -43,7 +42,7 @@ _test_and_set (int *p, int v) __THROW ("/* Inline test and set */\n" "1:\n\t" ".set push\n\t" -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 ".set mips2\n\t" #endif "ll %0,%3\n\t" diff --git a/sysdeps/unix/sysv/linux/mips/sys/ucontext.h b/sysdeps/unix/sysv/linux/mips/sys/ucontext.h index c03566b1ff..ddb499f20c 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/mips/sys/ucontext.h @@ -22,14 +22,13 @@ #define _SYS_UCONTEXT_H 1 #include <features.h> +#include <sgidefs.h> #include <signal.h> /* We need the signal context definitions even if they are not used included in <signal.h>. */ #include <bits/sigcontext.h> -#include <sgidefs.h> - /* Type for general register. Even in o32 we assume 64-bit registers, like the kernel. */ __extension__ typedef unsigned long long int greg_t; @@ -54,7 +53,7 @@ typedef struct fpregset { /* Context to describe whole processor state. */ -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 /* Earlier versions of glibc for mips had an entirely different definition of mcontext_t, that didn't even resemble the corresponding kernel data structure. Since all legitimate uses of diff --git a/sysdeps/unix/sysv/linux/mips/sys/user.h b/sysdeps/unix/sysv/linux/mips/sys/user.h index dc3ee837d3..d5b3b0508b 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/user.h +++ b/sysdeps/unix/sysv/linux/mips/sys/user.h @@ -32,7 +32,7 @@ instead of included separately, doesn't change in any way the licensing status of a program that includes user.h. Since this is for gdb alone, and gdb is GPLed, no surprises here. */ -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 /* * Various register offset definitions for debuggers, core file * examiners and whatnot. @@ -100,7 +100,7 @@ #endif /* __ASM_MIPS_REG_H */ -#else /* _MIPS_SIM != _MIPS_SIM_ABI32 */ +#else /* _MIPS_SIM != _ABIO32 */ /* * Various register offset definitions for debuggers, core file @@ -170,9 +170,9 @@ #endif /* _ASM_REG_H */ -#endif /* _MIPS_SIM != _MIPS_SIM_ABI32 */ +#endif /* _MIPS_SIM != _ABIO32 */ -#if _MIPS_SIM == _MIPS_SIM_ABI32 +#if _MIPS_SIM == _ABIO32 struct user { |