From e6acefa2ddd445e7e13aa89ced6d184a08ad8da6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 Jan 2016 22:33:34 +0100 Subject: nios2: allow to build toolchain At least allow to compile a toolchain targeting nios2 without MMU. --- libc/sysdeps/linux/nios2/bits/kernel_types.h | 16 ++++++++-------- libc/sysdeps/linux/nios2/bits/syscalls.h | 3 ++- libc/sysdeps/linux/nios2/crt1.S | 1 + libc/sysdeps/linux/nios2/vfork.S | 4 +--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h index 3c030e783..004f9c746 100644 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h @@ -4,8 +4,8 @@ * our private content, and not the kernel header, will win. * -Erik */ -#ifndef _ASM_NIOS2_POSIX_TYPES_H -#define _ASM_NIOS2_POSIX_TYPES_H +#ifndef __ASM_GENERIC_POSIX_TYPES_H +#define __ASM_GENERIC_POSIX_TYPES_H typedef unsigned long __kernel_dev_t; typedef unsigned long __kernel_ino_t; @@ -14,8 +14,8 @@ typedef unsigned short __kernel_nlink_t; typedef long __kernel_off_t; typedef int __kernel_pid_t; typedef unsigned short __kernel_ipc_pid_t; -typedef unsigned short __kernel_uid_t; -typedef unsigned short __kernel_gid_t; +typedef unsigned int __kernel_uid_t; +typedef unsigned int __kernel_gid_t; typedef unsigned int __kernel_size_t; typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; @@ -28,9 +28,9 @@ typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_gid16_t; typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; -typedef unsigned short __kernel_old_dev_t; +typedef unsigned int __kernel_old_uid_t; +typedef unsigned int __kernel_old_gid_t; +typedef unsigned int __kernel_old_dev_t; typedef long __kernel_long_t; typedef unsigned long __kernel_ulong_t; typedef long long __kernel_loff_t; @@ -43,4 +43,4 @@ typedef struct { #endif } __kernel_fsid_t; -#endif /* _ASM_NIOS2_POSIX_TYPES_H */ +#endif /* __ASM_GENERIC_POSIX_TYPES_H */ diff --git a/libc/sysdeps/linux/nios2/bits/syscalls.h b/libc/sysdeps/linux/nios2/bits/syscalls.h index 3214e3ce2..5be5d4d86 100644 --- a/libc/sysdeps/linux/nios2/bits/syscalls.h +++ b/libc/sysdeps/linux/nios2/bits/syscalls.h @@ -4,10 +4,11 @@ # error "Never use directly; include instead." #endif +#define TRAP_ID_SYSCALL 0 + #ifndef __ASSEMBLER__ #include -#include #define __syscall_return(type, res) \ do { \ diff --git a/libc/sysdeps/linux/nios2/crt1.S b/libc/sysdeps/linux/nios2/crt1.S index 7bf4e37b6..c178452ae 100644 --- a/libc/sysdeps/linux/nios2/crt1.S +++ b/libc/sysdeps/linux/nios2/crt1.S @@ -14,6 +14,7 @@ #include #include +#define TRAP_ID_SYSCALL 0 .global _start .type _start,@function diff --git a/libc/sysdeps/linux/nios2/vfork.S b/libc/sysdeps/linux/nios2/vfork.S index 5d61db030..2aee81e6c 100644 --- a/libc/sysdeps/linux/nios2/vfork.S +++ b/libc/sysdeps/linux/nios2/vfork.S @@ -12,9 +12,7 @@ #include -#ifndef __NR_vfork -#define __NR_vfork __NR_fork /* uClinux-2.0 only has fork which is vfork */ -#endif +#define __NR_vfork 1071 .text .global __vfork -- cgit v1.2.3