This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via e6acefa2ddd445e7e13aa89ced6d184a08ad8da6 (commit) via 61cf47568f3f81589cc4462945832c18ec3af410 (commit) from acffbf7d150101fe96c4fa1256fa73371049d4ff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e6acefa2ddd445e7e13aa89ced6d184a08ad8da6 Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Wed Jan 27 22:33:34 2016 +0100 nios2: allow to build toolchain At least allow to compile a toolchain targeting nios2 without MMU. commit 61cf47568f3f81589cc4462945832c18ec3af410 Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Wed Jan 27 22:32:52 2016 +0100 test: disable tests requiring math headers ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.nios2 | 1 - 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 +--- test/Makefile | 3 +++ test/locale-mbwc/Makefile.in | 4 ++++ 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/extra/Configs/Config.nios2 b/extra/Configs/Config.nios2 index 8bb8aca..2310a46 100644 --- a/extra/Configs/Config.nios2 +++ b/extra/Configs/Config.nios2 @@ -13,5 +13,4 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_LITTLE_ENDIAN select ARCH_HAS_NO_MMU select ARCH_HAS_NO_LDSO - select ARCH_HAS_DEPRECATED_SYSCALLS select HAVE_NO_PIC diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h index 3c030e7..004f9c7 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 3214e3c..5be5d4d 100644 --- a/libc/sysdeps/linux/nios2/bits/syscalls.h +++ b/libc/sysdeps/linux/nios2/bits/syscalls.h @@ -4,10 +4,11 @@ # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead." #endif +#define TRAP_ID_SYSCALL 0 + #ifndef __ASSEMBLER__ #include <errno.h> -#include <asm/traps.h> #define __syscall_return(type, res) \ do { \ diff --git a/libc/sysdeps/linux/nios2/crt1.S b/libc/sysdeps/linux/nios2/crt1.S index 7bf4e37..c178452 100644 --- a/libc/sysdeps/linux/nios2/crt1.S +++ b/libc/sysdeps/linux/nios2/crt1.S @@ -14,6 +14,7 @@ #include <features.h> #include <asm/unistd.h> +#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 5d61db0..2aee81e 100644 --- a/libc/sysdeps/linux/nios2/vfork.S +++ b/libc/sysdeps/linux/nios2/vfork.S @@ -12,9 +12,7 @@ #include <sys/syscall.h> -#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 diff --git a/test/Makefile b/test/Makefile index 525a69c..138308e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -21,6 +21,9 @@ endif ifneq ($(UCLIBC_HAS_THREADS)$(ARCH_USE_MMU),yy) DIRS := $(filter-out pthread,$(DIRS)) endif +ifneq ($(UCLIBC_HAS_FLOATS),y) + DIRS := $(filter-out math,$(DIRS)) +endif ifneq ($(UCLIBC_HAS_FULL_RPC),y) DIRS := $(filter-out rpc,$(DIRS)) endif diff --git a/test/locale-mbwc/Makefile.in b/test/locale-mbwc/Makefile.in index e70a613..d6a84f2 100644 --- a/test/locale-mbwc/Makefile.in +++ b/test/locale-mbwc/Makefile.in @@ -21,6 +21,10 @@ TESTS := tst_iswalnum tst_iswalpha tst_iswcntrl \ # NOTE: For now disabled tst_strfmon to avoid build failure. TESTS_DISABLED := tst_strfmon +ifneq ($(UCLIBC_HAS_FLOATS),y) +TESTS_DISABLED += tst_swscanf tst_wcstod +endif + DODIFF_rint := 1 EXTRA_CFLAGS := -D__USE_GNU -fno-builtin -fPIC hooks/post-receive -- uClibc-ng - small C library for embedded systems