devel

devel@uclibc-ng.org

1 participants
1164 discussions

[PATCH] xtensa: fix strcmp
by Max Filippov 09 Jan '18

09 Jan '18

Loops with 'loop forever' annotation inside strcmp are actually meant to loop forever. Falling through the end of the first loop may result in equal strings being compared unequal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 258 * 8); memset(b, ' ', 258 * 8); a[255 * 8] = 0; a[256 * 8] = 'a'; b[255 * 8] = 0; b[256 * 8] = 'b'; return !(strcmp(a, b) == 0); } Falling through the end of the second loop may result in unequal strings being compared as equal, e.g.: #include <string.h> int main(void) { char a[4096] __attribute__((aligned(4))); char b[4096] __attribute__((aligned(4))); memset(a, ' ', 514 * 4); memset(b, ' ', 514 * 4); a[514 * 4 + 0] = 'a'; a[514 * 4 + 1] = 0; b[514 * 4 + 0] = 'b'; b[514 * 4 + 1] = 0; return !(strcmp(a, b) != 0); } Use 0 as a loop counter to make 2^32 - 1 iterations which is enough to cover all addressable memory. While at it drop useless nop at the end of the first loop and use a11 for all loop counters. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- libc/string/xtensa/strcmp.S | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libc/string/xtensa/strcmp.S b/libc/string/xtensa/strcmp.S index 2dce590dbd42..a16da5da2e92 100644 --- a/libc/string/xtensa/strcmp.S +++ b/libc/string/xtensa/strcmp.S @@ -92,8 +92,8 @@ ENTRY (strcmp) /* (2 mod 4) alignment for loop instruction */ .Lunaligned: #if XCHAL_HAVE_LOOPS - _movi.n a8, 0 /* set up for the maximum loop count */ - loop a8, .Lretdiff /* loop forever (almost anyway) */ + movi a11, 0 /* set up for the maximum loop count */ + loop a11, .Lretdiff /* loop forever (almost anyway) */ #endif .Lnextbyte: l8ui a8, a2, 0 @@ -131,11 +131,10 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS .Laligned: .begin no-transform + movi a11, 0 l32r a4, .Lmask0 /* mask for byte 0 */ l32r a7, .Lmask4 - /* Loop forever. (a4 is more than than the maximum number - of iterations) */ - loop a4, .Laligned_done + loop a11, .Laligned_done /* Loop forever. */ /* First unrolled loop body. */ l32i a8, a2, 0 /* get word from s1 */ @@ -156,8 +155,6 @@ ENTRY (strcmp) addi a2, a2, 8 /* advance s1 pointer */ addi a3, a3, 8 /* advance s2 pointer */ .Laligned_done: - or a1, a1, a1 /* nop */ - .Lprobeq2: /* Adjust pointers to account for the loop unrolling. */ addi a2, a2, 4 @@ -198,7 +195,7 @@ ENTRY (strcmp) #if XCHAL_HAVE_LOOPS /* align (1 mod 4) */ - loop a4, .Leq /* loop forever (a4 is bigger than max iters) */ + loop a11, .Leq /* loop forever */ .end no-transform l32i a8, a2, 0 /* get word from s1 */ -- 2.1.4

1 0

[PATCH] csky: bugfix libc sync_file_range.c for csky.
by Guo Ren 09 Jan '18

09 Jan '18

Use __NR_sync_file_range2 for csky sync_file_range function. Signed-off-by: Guo Ren <ren_guo(a)c-sky.com> --- libc/sysdeps/linux/common/sync_file_range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/common/sync_file_range.c b/libc/sysdeps/linux/common/sync_file_range.c index 3e7c4b5..328869b 100644 --- a/libc/sysdeps/linux/common/sync_file_range.c +++ b/libc/sysdeps/linux/common/sync_file_range.c @@ -27,7 +27,7 @@ static int __NC(sync_file_range)(int fd, off64_t offset, off64_t nbytes, unsigne return INLINE_SYSCALL(sync_file_range, 6, fd, OFF64_HI_LO(offset), OFF64_HI_LO(nbytes), flags); # elif (defined __mips__ && _MIPS_SIM == _ABIO32) || \ - (defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) && !(defined(__powerpc__) || defined(__xtensa__) || defined(__nds32__))) + (defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) && !(defined(__powerpc__) || defined(__xtensa__) || defined(__nds32__) || defined(__csky__))) /* arch with 64-bit data in even reg alignment #2: [arcv2/others-in-future] * stock syscall handler in kernel (reg hole punched) * see libc/sysdeps/linux/common/posix_fadvise.c for more details */ -- 2.7.4

2 1

lowlevellock.h patch
by Waldemar Brodkorb 07 Jan '18

07 Jan '18

Hi, I would like to push attached patch. No regressions found. Any comments? best regards Waldemar

2 1

Re: [uclibc-ng-devel] [PATCH 3/4] nds32: Use new common syscall() implementation
by Waldemar Brodkorb 07 Jan '18

07 Jan '18

Hi, vincentc(a)andestech.com wrote, > Dear all: > Stafford is right. internal_syscall_ncs6 is able to define in libc/sysdeps/linux/nds32/bits/syscalls.h like the following. > > #define internal_syscall_ncs6(name, err, arg1, arg2, arg3, arg4, arg5, arg6) \ > ({ \ > register long __res __asm__("$r0"); \ > register long __no __asm__("$r0") = (long) (name); \ > register long __arg1 __asm__("$r1") = (long) (arg1); \ > register long __arg2 __asm__("$r2") = (long) (arg2); \ > register long __arg3 __asm__("$r3") = (long) (arg3); \ > register long __arg4 __asm__("$r4") = (long) (arg4); \ > register long __arg5 __asm__("$r5") = (long) (arg5); \ > __asm__ volatile ( \ > "addi10.sp\t #-4\n\t" \ > CFI_ADJUST_CFA_OFFSET(4)"\n\t" \ > "push\t %7\n\t" \ > CFI_ADJUST_CFA_OFFSET(4)"\n\t" \ > __issue_syscall (LIB_SYSCALL) \ > "pop\t %7\n\t" \ > CFI_ADJUST_CFA_OFFSET(-4)"\n\t" \ > "addi10.sp\t #4\n\t" \ > CFI_ADJUST_CFA_OFFSET(-4)"\n\t" \ > __asm__ volatile ( \ > __issue_syscall (LIB_SYSCALL) \ > : "=r" (__res) /* output operands */ \ > : "r" (__no) /* input operands */ \ > , "r" (__arg1) /* input operands */ \ > , "r" (__arg2) /* input operands */ \ > , "r" (__arg3) /* input operands */ \ > , "r" (__arg4) /* input operands */ \ > , "r" (__arg5) /* input operands */ \ > , "r" (arg6) /* input operands */ \ > : __SYSCALL_CLOBBERS); /* list of clobbered registers */ \ > __res; \ > }) > > The value of argument "name" is the number of specified syscall. > This syscall will be sent to kernel later through sys_syscall by "__issue_syscall (LIB_SYSCALL)". > When testing Stafford patch from: https://github.com/stffrdhrn/uclibc-ng.git -> branch gen-syscall I added a missing ); before the second __asm__ volatile. I get: /home/wbx/nds32/toolchain_andes-ag101p_uclibc-ng_nds32le/usr/bin/nds32le-openadk-linux-uclibc-gcc -c libc/sysdeps/linux/common/syscall.c -o libc/sysdeps/linux/common/syscall.os -Wall -Wstrict-prototypes -Wstrict-aliasing -funsigned-char -fno-builtin -fno-asm -fmerge-all-constants -std=gnu99 -fno-stack-protector -nostdinc -I./include -I./include -include libc-symbols.h -I./libc/sysdeps/linux/nds32 -I./libc/sysdeps/linux -I./ldso/ldso/nds32 -I./ldso/include -I. -Os -fstrict-aliasing -fwrapv -fno-ident -mcpu=n13 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -D__USE_STDIO_FUTEXES__ -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT -I./libpthread/nptl -I./libpthread/nptl -I./libpthread/nptl/sysdeps/unix/sysv/linux/nds32 -I./libpthread/nptl/sysdeps/nds32 -I./libpthread/nptl/sysdeps/nds32 -I./libpthread/nptl/sysdeps/unix/sysv/linux -I./libpthread/nptl/sysdeps/unix/sysv/linux -I./libpthread/nptl/sysdeps/pthread -I./libpthread/nptl/sysdeps/pthread/bits -I./libpthread/nptl/sysdeps/generic -I./libc/sysdeps/linux/common -isystem /home/wbx/nds32/toolchain_andes-ag101p_uclibc-ng_nds32le/usr/lib/gcc/nds32le-openadk-linux-uclibc/4.9.4/include-fixed -isystem /home/wbx/nds32/toolchain_andes-ag101p_uclibc-ng_nds32le/usr/lib/gcc/nds32le-openadk-linux-uclibc/4.9.4/include -I/home/wbx/nds32/target_andes-ag101p_uclibc-ng_nds32le/usr/include/ -DNDEBUG -DIN_LIB=libc -DPIC -fPIC -MT libc/sysdeps/linux/common/syscall.os -MD -MP -MF libc/sysdeps/linux/common/.syscall.os.dep {standard input}: Assembler messages: {standard input}:62: Error: Unrecognized operand/register, smw.adm $r-1,[$sp],$r-1,0. {standard input}:65: Error: Unrecognized operand/register, lmw.bim $r-1,[$sp],$r-1,0. Makerules:369: recipe for target 'libc/sysdeps/linux/common/syscall.os' failed Ideas? best regards Waldemar

1 0

[PATCH] csky: add Copyright.
by Guo Ren 30 Dec '17

30 Dec '17

Signed-off-by: Guo Ren <ren_guo(a)c-sky.com> --- ldso/ldso/csky/dl-startup.h | 7 +++++++ ldso/ldso/csky/dl-syscalls.h | 7 +++++++ ldso/ldso/csky/dl-sysdep.h | 7 +++++++ ldso/ldso/csky/elfinterp.c | 7 +++++++ ldso/ldso/csky/read_tp.S | 7 +++++++ ldso/ldso/csky/resolve.S | 7 +++++++ libc/string/csky/cskyv1/memcpy.S | 7 +++++++ libc/string/csky/cskyv1/strcmp.S | 7 +++++++ libc/string/csky/cskyv1/strcpy.S | 7 +++++++ libc/string/csky/cskyv2/abiv2_memcpy.S | 7 +++++++ libc/string/csky/cskyv2/abiv2_strcmp.S | 7 +++++++ libc/string/csky/cskyv2/abiv2_strcpy.S | 7 +++++++ libc/string/csky/cskyv2/macro.S | 7 +++++++ libc/string/csky/memcpy.S | 7 +++++++ libc/string/csky/strcmp.S | 7 +++++++ libc/string/csky/strcpy.S | 7 +++++++ libc/sysdeps/linux/csky/__longjmp.S | 7 +++++++ libc/sysdeps/linux/csky/__syscall_error.c | 7 +++++++ libc/sysdeps/linux/csky/bits/atomic.h | 7 +++++++ libc/sysdeps/linux/csky/bits/endian.h | 7 +++++++ libc/sysdeps/linux/csky/bits/fcntl.h | 7 +++++++ libc/sysdeps/linux/csky/bits/fenv.h | 7 +++++++ libc/sysdeps/linux/csky/bits/kernel_stat.h | 7 +++++++ libc/sysdeps/linux/csky/bits/kernel_types.h | 7 +++++++ libc/sysdeps/linux/csky/bits/mathinline.h | 7 +++++++ libc/sysdeps/linux/csky/bits/setjmp.h | 7 +++++++ libc/sysdeps/linux/csky/bits/shm.h | 7 +++++++ libc/sysdeps/linux/csky/bits/sigcontextinfo.h | 7 +++++++ libc/sysdeps/linux/csky/bits/stackinfo.h | 7 +++++++ libc/sysdeps/linux/csky/bits/syscalls.h | 7 +++++++ libc/sysdeps/linux/csky/bits/uClibc_arch_features.h | 7 +++++++ libc/sysdeps/linux/csky/bits/wordsize.h | 7 +++++++ libc/sysdeps/linux/csky/cacheflush.c | 7 +++++++ libc/sysdeps/linux/csky/clone.c | 7 +++++++ libc/sysdeps/linux/csky/crt1.S | 7 +++++++ libc/sysdeps/linux/csky/crti.S | 7 +++++++ libc/sysdeps/linux/csky/crtn.S | 7 +++++++ libc/sysdeps/linux/csky/csky_clone.S | 7 +++++++ libc/sysdeps/linux/csky/jmpbuf-unwind.h | 7 +++++++ libc/sysdeps/linux/csky/libc-read_tp.S | 7 +++++++ libc/sysdeps/linux/csky/setjmp.S | 7 +++++++ libc/sysdeps/linux/csky/sys/cachectl.h | 7 +++++++ libc/sysdeps/linux/csky/sys/procfs.h | 7 +++++++ libc/sysdeps/linux/csky/sys/ucontext.h | 7 +++++++ libc/sysdeps/linux/csky/sys/user.h | 7 +++++++ libc/sysdeps/linux/csky/sysdep.h | 7 +++++++ libc/sysdeps/linux/csky/vfork.S | 7 +++++++ libpthread/nptl/sysdeps/csky/dl-tls.h | 7 +++++++ libpthread/nptl/sysdeps/csky/libc-tls.c | 7 +++++++ libpthread/nptl/sysdeps/csky/pthread_spin_lock.S | 7 +++++++ libpthread/nptl/sysdeps/csky/pthread_spin_trylock.S | 7 +++++++ libpthread/nptl/sysdeps/csky/pthreaddef.h | 7 +++++++ libpthread/nptl/sysdeps/csky/tls.h | 7 +++++++ libpthread/nptl/sysdeps/unix/sysv/linux/csky/createthread.c | 7 +++++++ libpthread/nptl/sysdeps/unix/sysv/linux/csky/sysdep-cancel.h | 7 +++++++ 55 files changed, 385 insertions(+) diff --git a/ldso/ldso/csky/dl-startup.h b/ldso/ldso/csky/dl-startup.h index 0a74ab6..a5bcd9d 100644 --- a/ldso/ldso/csky/dl-startup.h +++ b/ldso/ldso/csky/dl-startup.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifdef __CSKYABIV2__ __asm__ ( diff --git a/ldso/ldso/csky/dl-syscalls.h b/ldso/ldso/csky/dl-syscalls.h index f40c4fd..703732b 100644 --- a/ldso/ldso/csky/dl-syscalls.h +++ b/ldso/ldso/csky/dl-syscalls.h @@ -1 +1,8 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* stub for arch-specific syscall issues */ diff --git a/ldso/ldso/csky/dl-sysdep.h b/ldso/ldso/csky/dl-sysdep.h index c78dd81..04aae68 100644 --- a/ldso/ldso/csky/dl-sysdep.h +++ b/ldso/ldso/csky/dl-sysdep.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Define this if the system uses RELOCA. */ #define ELF_USES_RELOCA diff --git a/ldso/ldso/csky/elfinterp.c b/ldso/ldso/csky/elfinterp.c index 1469c28..9dba2a0 100644 --- a/ldso/ldso/csky/elfinterp.c +++ b/ldso/ldso/csky/elfinterp.c @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include "ldso.h" unsigned long diff --git a/ldso/ldso/csky/read_tp.S b/ldso/ldso/csky/read_tp.S index ef8d509..d9be325 100644 --- a/ldso/ldso/csky/read_tp.S +++ b/ldso/ldso/csky/read_tp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> #ifndef NOT_IN_libc diff --git a/ldso/ldso/csky/resolve.S b/ldso/ldso/csky/resolve.S index 46a4363..7db74d6 100644 --- a/ldso/ldso/csky/resolve.S +++ b/ldso/ldso/csky/resolve.S @@ -1,4 +1,11 @@ /* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + +/* * This function is not called directly. It is jumped when attempting to use a * symbol that has not yet been resolved. * diff --git a/libc/string/csky/cskyv1/memcpy.S b/libc/string/csky/cskyv1/memcpy.S index dfa7f64..1b33258 100644 --- a/libc/string/csky/cskyv1/memcpy.S +++ b/libc/string/csky/cskyv1/memcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + .macro GET_FRONT_BITS rx ry #ifdef __cskyLE__ lsr \rx, \ry diff --git a/libc/string/csky/cskyv1/strcmp.S b/libc/string/csky/cskyv1/strcmp.S index e22f29e..e16c28a 100644 --- a/libc/string/csky/cskyv1/strcmp.S +++ b/libc/string/csky/cskyv1/strcmp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <features.h> #include <endian.h> diff --git a/libc/string/csky/cskyv1/strcpy.S b/libc/string/csky/cskyv1/strcpy.S index c2f1e7a..8518d7f 100644 --- a/libc/string/csky/cskyv1/strcpy.S +++ b/libc/string/csky/cskyv1/strcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <features.h> #include <endian.h> diff --git a/libc/string/csky/cskyv2/abiv2_memcpy.S b/libc/string/csky/cskyv2/abiv2_memcpy.S index c112ec0..4bbb7a3 100644 --- a/libc/string/csky/cskyv2/abiv2_memcpy.S +++ b/libc/string/csky/cskyv2/abiv2_memcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + .macro GET_FRONT_BITS rx ry #ifdef __cskyLE__ lsr \rx, \ry diff --git a/libc/string/csky/cskyv2/abiv2_strcmp.S b/libc/string/csky/cskyv2/abiv2_strcmp.S index 202da7c..8d7fa04 100644 --- a/libc/string/csky/cskyv2/abiv2_strcmp.S +++ b/libc/string/csky/cskyv2/abiv2_strcmp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <endian.h> #include "macro.S" diff --git a/libc/string/csky/cskyv2/abiv2_strcpy.S b/libc/string/csky/cskyv2/abiv2_strcpy.S index 20262fe..cc6cafe 100644 --- a/libc/string/csky/cskyv2/abiv2_strcpy.S +++ b/libc/string/csky/cskyv2/abiv2_strcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <endian.h> #include "macro.S" diff --git a/libc/string/csky/cskyv2/macro.S b/libc/string/csky/cskyv2/macro.S index 047645c..1b78ce8 100644 --- a/libc/string/csky/cskyv2/macro.S +++ b/libc/string/csky/cskyv2/macro.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + .macro M_BEZ rx, label bez \rx, \label .endm diff --git a/libc/string/csky/memcpy.S b/libc/string/csky/memcpy.S index 51d258a..5646c26 100644 --- a/libc/string/csky/memcpy.S +++ b/libc/string/csky/memcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <features.h> #ifdef __CSKYABIV2__ diff --git a/libc/string/csky/strcmp.S b/libc/string/csky/strcmp.S index 05a88c9..c05a108 100644 --- a/libc/string/csky/strcmp.S +++ b/libc/string/csky/strcmp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <features.h> #ifdef __CSKYABIV2__ diff --git a/libc/string/csky/strcpy.S b/libc/string/csky/strcpy.S index dd3be04..a4bdf5c 100644 --- a/libc/string/csky/strcpy.S +++ b/libc/string/csky/strcpy.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <features.h> #ifdef __CSKYABIV2__ diff --git a/libc/sysdeps/linux/csky/__longjmp.S b/libc/sysdeps/linux/csky/__longjmp.S index 66ad626..8dbd3d6 100644 --- a/libc/sysdeps/linux/csky/__longjmp.S +++ b/libc/sysdeps/linux/csky/__longjmp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> ENTRY(__longjmp) diff --git a/libc/sysdeps/linux/csky/__syscall_error.c b/libc/sysdeps/linux/csky/__syscall_error.c index 346ce8a..cc1fb59 100644 --- a/libc/sysdeps/linux/csky/__syscall_error.c +++ b/libc/sysdeps/linux/csky/__syscall_error.c @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <errno.h> #include <features.h> diff --git a/libc/sysdeps/linux/csky/bits/atomic.h b/libc/sysdeps/linux/csky/bits/atomic.h index 231d58f..5913813 100644 --- a/libc/sysdeps/linux/csky/bits/atomic.h +++ b/libc/sysdeps/linux/csky/bits/atomic.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef __CSKY_ATOMIC_H_ #define __CSKY_ATOMIC_H_ diff --git a/libc/sysdeps/linux/csky/bits/endian.h b/libc/sysdeps/linux/csky/bits/endian.h index 09af89c..80b77f0 100644 --- a/libc/sysdeps/linux/csky/bits/endian.h +++ b/libc/sysdeps/linux/csky/bits/endian.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _ENDIAN_H # error "Never use <bits/endian.h> directly; include <endian.h> instead." #endif diff --git a/libc/sysdeps/linux/csky/bits/fcntl.h b/libc/sysdeps/linux/csky/bits/fcntl.h index feacdad..859b42f 100644 --- a/libc/sysdeps/linux/csky/bits/fcntl.h +++ b/libc/sysdeps/linux/csky/bits/fcntl.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _FCNTL_H # error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead." #endif diff --git a/libc/sysdeps/linux/csky/bits/fenv.h b/libc/sysdeps/linux/csky/bits/fenv.h index 606fe79..3359e1f 100644 --- a/libc/sysdeps/linux/csky/bits/fenv.h +++ b/libc/sysdeps/linux/csky/bits/fenv.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _FENV_H # error "Never use <bits/fenv.h> directly; include <fenv.h> instead." #endif diff --git a/libc/sysdeps/linux/csky/bits/kernel_stat.h b/libc/sysdeps/linux/csky/bits/kernel_stat.h index 079a01a..dae77fd 100644 --- a/libc/sysdeps/linux/csky/bits/kernel_stat.h +++ b/libc/sysdeps/linux/csky/bits/kernel_stat.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _BITS_STAT_STRUCT_H #define _BITS_STAT_STRUCT_H diff --git a/libc/sysdeps/linux/csky/bits/kernel_types.h b/libc/sysdeps/linux/csky/bits/kernel_types.h index 80c9d59..6c6fe74 100644 --- a/libc/sysdeps/linux/csky/bits/kernel_types.h +++ b/libc/sysdeps/linux/csky/bits/kernel_types.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Note that we use the exact same include guard #define names * as asm/posix_types.h. This will avoid gratuitous conflicts * with the posix_types.h kernel header, and will ensure that diff --git a/libc/sysdeps/linux/csky/bits/mathinline.h b/libc/sysdeps/linux/csky/bits/mathinline.h index d6ab1a2..b1a6330 100644 --- a/libc/sysdeps/linux/csky/bits/mathinline.h +++ b/libc/sysdeps/linux/csky/bits/mathinline.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifdef __GNUC__ #ifdef __USE_ISOC99 diff --git a/libc/sysdeps/linux/csky/bits/setjmp.h b/libc/sysdeps/linux/csky/bits/setjmp.h index c818ec9..8753bbc 100644 --- a/libc/sysdeps/linux/csky/bits/setjmp.h +++ b/libc/sysdeps/linux/csky/bits/setjmp.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _BITS_SETJMP_H #define _BITS_SETJMP_H 1 diff --git a/libc/sysdeps/linux/csky/bits/shm.h b/libc/sysdeps/linux/csky/bits/shm.h index bfb44bb..dced132 100644 --- a/libc/sysdeps/linux/csky/bits/shm.h +++ b/libc/sysdeps/linux/csky/bits/shm.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _SYS_SHM_H # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead." #endif diff --git a/libc/sysdeps/linux/csky/bits/sigcontextinfo.h b/libc/sysdeps/linux/csky/bits/sigcontextinfo.h index b7e08cf..283b492 100644 --- a/libc/sysdeps/linux/csky/bits/sigcontextinfo.h +++ b/libc/sysdeps/linux/csky/bits/sigcontextinfo.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab <schwab(a)issan.informatik.uni-dortmund.de>, 1998. diff --git a/libc/sysdeps/linux/csky/bits/stackinfo.h b/libc/sysdeps/linux/csky/bits/stackinfo.h index aaf9807..c0bb2dd 100644 --- a/libc/sysdeps/linux/csky/bits/stackinfo.h +++ b/libc/sysdeps/linux/csky/bits/stackinfo.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _STACKINFO_H #define _STACKINFO_H 1 diff --git a/libc/sysdeps/linux/csky/bits/syscalls.h b/libc/sysdeps/linux/csky/bits/syscalls.h index 04d01f4..e997de9 100644 --- a/libc/sysdeps/linux/csky/bits/syscalls.h +++ b/libc/sysdeps/linux/csky/bits/syscalls.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _BITS_SYSCALLS_H #define _BITS_SYSCALLS_H #ifndef _SYSCALL_H diff --git a/libc/sysdeps/linux/csky/bits/uClibc_arch_features.h b/libc/sysdeps/linux/csky/bits/uClibc_arch_features.h index ca898ee..1b866cb 100644 --- a/libc/sysdeps/linux/csky/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/csky/bits/uClibc_arch_features.h @@ -1,4 +1,11 @@ /* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + +/* * Track misc arch-specific features that aren't config options */ diff --git a/libc/sysdeps/linux/csky/bits/wordsize.h b/libc/sysdeps/linux/csky/bits/wordsize.h index 1b5842a..a0b76b3 100644 --- a/libc/sysdeps/linux/csky/bits/wordsize.h +++ b/libc/sysdeps/linux/csky/bits/wordsize.h @@ -1 +1,8 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #define __WORDSIZE 32 diff --git a/libc/sysdeps/linux/csky/cacheflush.c b/libc/sysdeps/linux/csky/cacheflush.c index 7762c73..37b356a 100644 --- a/libc/sysdeps/linux/csky/cacheflush.c +++ b/libc/sysdeps/linux/csky/cacheflush.c @@ -1,2 +1,9 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sys/syscall.h> _syscall3(int, cacheflush, void *, addr, int, nbytes, int, op) diff --git a/libc/sysdeps/linux/csky/clone.c b/libc/sysdeps/linux/csky/clone.c index 97c30d0..991cb89 100644 --- a/libc/sysdeps/linux/csky/clone.c +++ b/libc/sysdeps/linux/csky/clone.c @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <stdarg.h> #include <sysdep.h> #include <unistd.h> diff --git a/libc/sysdeps/linux/csky/crt1.S b/libc/sysdeps/linux/csky/crt1.S index ae73843..48651d9 100644 --- a/libc/sysdeps/linux/csky/crt1.S +++ b/libc/sysdeps/linux/csky/crt1.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> .text diff --git a/libc/sysdeps/linux/csky/crti.S b/libc/sysdeps/linux/csky/crti.S index e85a81c..e7b045f 100644 --- a/libc/sysdeps/linux/csky/crti.S +++ b/libc/sysdeps/linux/csky/crti.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> .file "initfini.c" diff --git a/libc/sysdeps/linux/csky/crtn.S b/libc/sysdeps/linux/csky/crtn.S index 3814f30..c1c989f 100644 --- a/libc/sysdeps/linux/csky/crtn.S +++ b/libc/sysdeps/linux/csky/crtn.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + .file "initfini.c" .section .init diff --git a/libc/sysdeps/linux/csky/csky_clone.S b/libc/sysdeps/linux/csky/csky_clone.S index 8360469..edd63ac 100644 --- a/libc/sysdeps/linux/csky/csky_clone.S +++ b/libc/sysdeps/linux/csky/csky_clone.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> PSEUDO_ERRVAL(__csky_clone, clone, 5) diff --git a/libc/sysdeps/linux/csky/jmpbuf-unwind.h b/libc/sysdeps/linux/csky/jmpbuf-unwind.h index 30e39f4..15144fe 100644 --- a/libc/sysdeps/linux/csky/jmpbuf-unwind.h +++ b/libc/sysdeps/linux/csky/jmpbuf-unwind.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <setjmp.h> #include <stdint.h> #include <unwind.h> diff --git a/libc/sysdeps/linux/csky/libc-read_tp.S b/libc/sysdeps/linux/csky/libc-read_tp.S index 1974cba..7d1a059 100644 --- a/libc/sysdeps/linux/csky/libc-read_tp.S +++ b/libc/sysdeps/linux/csky/libc-read_tp.S @@ -1 +1,8 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <ldso/ldso/csky/read_tp.S> diff --git a/libc/sysdeps/linux/csky/setjmp.S b/libc/sysdeps/linux/csky/setjmp.S index daadcb3..03b402b 100644 --- a/libc/sysdeps/linux/csky/setjmp.S +++ b/libc/sysdeps/linux/csky/setjmp.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> ENTRY(setjmp) diff --git a/libc/sysdeps/linux/csky/sys/cachectl.h b/libc/sysdeps/linux/csky/sys/cachectl.h index 0d45bf0..ad7211d 100644 --- a/libc/sysdeps/linux/csky/sys/cachectl.h +++ b/libc/sysdeps/linux/csky/sys/cachectl.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _SYS_CACHECTL_H #define _SYS_CACHECTL_H 1 diff --git a/libc/sysdeps/linux/csky/sys/procfs.h b/libc/sysdeps/linux/csky/sys/procfs.h index 91c1388..8ee9931 100644 --- a/libc/sysdeps/linux/csky/sys/procfs.h +++ b/libc/sysdeps/linux/csky/sys/procfs.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/libc/sysdeps/linux/csky/sys/ucontext.h b/libc/sysdeps/linux/csky/sys/ucontext.h index 5917688..97e9e5e 100644 --- a/libc/sysdeps/linux/csky/sys/ucontext.h +++ b/libc/sysdeps/linux/csky/sys/ucontext.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _SYS_UCONTEXT_H #define _SYS_UCONTEXT_H 1 diff --git a/libc/sysdeps/linux/csky/sys/user.h b/libc/sysdeps/linux/csky/sys/user.h index 4ab1972..010e548 100644 --- a/libc/sysdeps/linux/csky/sys/user.h +++ b/libc/sysdeps/linux/csky/sys/user.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _SYS_USER_H #define _SYS_USER_H 1 diff --git a/libc/sysdeps/linux/csky/sysdep.h b/libc/sysdeps/linux/csky/sysdep.h index 2fcff68..a44f3ce 100644 --- a/libc/sysdeps/linux/csky/sysdep.h +++ b/libc/sysdeps/linux/csky/sysdep.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _LINUX_CSKY_SYSDEP_H #define _LINUX_CSKY_SYSDEP_H 1 diff --git a/libc/sysdeps/linux/csky/vfork.S b/libc/sysdeps/linux/csky/vfork.S index a28bb32..bca8bb8 100644 --- a/libc/sysdeps/linux/csky/vfork.S +++ b/libc/sysdeps/linux/csky/vfork.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> PSEUDO_ERRVAL(__vfork, vfork, 0) PSEUDO_END_ERRVAL(__vfork) diff --git a/libpthread/nptl/sysdeps/csky/dl-tls.h b/libpthread/nptl/sysdeps/csky/dl-tls.h index 70f7e96..ebf1a7d 100644 --- a/libpthread/nptl/sysdeps/csky/dl-tls.h +++ b/libpthread/nptl/sysdeps/csky/dl-tls.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Type used for the representation of TLS information in the GOT. */ typedef struct { diff --git a/libpthread/nptl/sysdeps/csky/libc-tls.c b/libpthread/nptl/sysdeps/csky/libc-tls.c index ceb61f8..21aacec 100644 --- a/libpthread/nptl/sysdeps/csky/libc-tls.c +++ b/libpthread/nptl/sysdeps/csky/libc-tls.c @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdeps/generic/libc-tls.c> #include <dl-tls.h> diff --git a/libpthread/nptl/sysdeps/csky/pthread_spin_lock.S b/libpthread/nptl/sysdeps/csky/pthread_spin_lock.S index da6e234..e24cac2 100644 --- a/libpthread/nptl/sysdeps/csky/pthread_spin_lock.S +++ b/libpthread/nptl/sysdeps/csky/pthread_spin_lock.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> .text diff --git a/libpthread/nptl/sysdeps/csky/pthread_spin_trylock.S b/libpthread/nptl/sysdeps/csky/pthread_spin_trylock.S index 113e94d..2682e4c 100644 --- a/libpthread/nptl/sysdeps/csky/pthread_spin_trylock.S +++ b/libpthread/nptl/sysdeps/csky/pthread_spin_trylock.S @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #define _ERRNO_H 1 #include <bits/errno.h> #include <sysdep.h> diff --git a/libpthread/nptl/sysdeps/csky/pthreaddef.h b/libpthread/nptl/sysdeps/csky/pthreaddef.h index da6a0fa..992fced 100644 --- a/libpthread/nptl/sysdeps/csky/pthreaddef.h +++ b/libpthread/nptl/sysdeps/csky/pthreaddef.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Default stack size. */ #define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) diff --git a/libpthread/nptl/sysdeps/csky/tls.h b/libpthread/nptl/sysdeps/csky/tls.h index 721551c..6a07401 100644 --- a/libpthread/nptl/sysdeps/csky/tls.h +++ b/libpthread/nptl/sysdeps/csky/tls.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #ifndef _TLS_H #define _TLS_H 1 diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/csky/createthread.c b/libpthread/nptl/sysdeps/unix/sysv/linux/csky/createthread.c index bad8b05..9980cc0 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/csky/createthread.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/csky/createthread.c @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + /* Value passed to 'clone' for initialization of the thread register. */ #define TLS_VALUE (pd + 1) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/csky/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/csky/sysdep-cancel.h index 34c43b0..d8ec5bf 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/csky/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/csky/sysdep-cancel.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2017 Hangzhou C-SKY Microsystems co.,ltd. + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB + * in this tarball. + */ + #include <sysdep.h> #include <tls.h> #ifndef __ASSEMBLER__ -- 2.7.4

2 1

[PATCH] csky: remove -mcpu and -mhard-float from config
by Guo Ren 26 Dec '17

26 Dec '17

Pass the -mcpu and -mhard-float from UCLIBC_EXTRA_CFLAGS instead. Signed-off-by: Guo Ren <ren_guo(a)c-sky.com> --- Rules.mak | 6 ------ extra/Configs/Config.csky | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/Rules.mak b/Rules.mak index 9a56415..418a480 100644 --- a/Rules.mak +++ b/Rules.mak @@ -458,12 +458,6 @@ ifeq ($(TARGET_ARCH),csky) # So we couldn't strip them for objdump. STRIP_FLAGS += -K "$$"t -K "$$"d - CPU_CFLAGS-$(CK610) += -mcpu=ck610f - CPU_CFLAGS-$(CK810) += -mcpu=ck810f - CPU_CFLAGS-$(CK807) += -mcpu=ck807f - - CPU_CFLAGS-$(UCLIBC_HAS_FPU) += -mhard-float - CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN) += -mlittle-endian CPU_CFLAGS-$(ARCH_BIG_ENDIAN) += -mbig-endian endif diff --git a/extra/Configs/Config.csky b/extra/Configs/Config.csky index 704f7be..3173ce9 100644 --- a/extra/Configs/Config.csky +++ b/extra/Configs/Config.csky @@ -10,16 +10,3 @@ config FORCE_OPTIONS_FOR_ARCH select ARCH_USE_MMU select ARCH_HAS_MMU -choice - prompt "Target Processor Type" - default CK610 - -config CK610 - bool "ck610" -config CK810 - bool "ck810" -config CK807 - bool "ck807" - -endchoice - -- 2.7.4

1 0

[PATCH] Fix subtle race in tst-cancel2 / tst-cancelx2
by Vineet Gupta 18 Dec '17

18 Dec '17

When ran on ARC, these tests would ocassionally fail | [ARCLinux]# for i in 1 2 3 4 5 ; do ./tst-cancel2; echo $?; done | write succeeded | result is wrong: expected 0xffffffff, got 0x1 | 1 <-- fail | 0 <-- pass | 0 <--- pass | 0 <-- pass | write succeeded | result is wrong: expected 0xffffffff, got 0x1 | 1 <-- fail Same test (which originated form glibc) doesn't fail in glibc builds. Turns out there's a subtle race in uclibc version The test creates a new thread, makes it do a looong write call, and parent then cancels the thread, expecting it to unwind out of write call cleanly. However the write (even for 10k bytes) could fnish befor eparent gets a chance ti run and/or cancel - causing the occasional failire. Cc: Cupertino Miranda <cmiranda(a)synopsys.com> Fix this subtelty by making it write not just once but forever. Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> --- test/nptl/tst-cancel2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/nptl/tst-cancel2.c b/test/nptl/tst-cancel2.c index 45c9e8ea957a..08dd13b10f37 100644 --- a/test/nptl/tst-cancel2.c +++ b/test/nptl/tst-cancel2.c @@ -32,11 +32,7 @@ tf (void *arg) write blocks. */ char buf[100000]; - if (write (fd[1], buf, sizeof (buf)) == sizeof (buf)) - { - puts ("write succeeded"); - return (void *) 1l; - } + while (write (fd[1], buf, sizeof (buf)) > 0); return (void *) 42l; } -- 2.7.4

2 3

[PATCH] tst-syscall*: Add tests for syscall() with varargs
by Stafford Horne 17 Dec '17

17 Dec '17

Add tests in preparation for genericizing some of the architecture syscall() implementations. This was noticed when testing OR1K and found it had a broken syscall implementation. These tests try to cover the libc syscall() lqyer which has the purpose of passing the syscall number and arguments to the kernel. The actual kernel syscalls chosen have been selected for ease of testing. Signed-off-by: Stafford Horne <shorne(a)gmail.com> --- test/misc/tst-syscall0.c | 15 ++++++++++++ test/misc/tst-syscall1.c | 18 ++++++++++++++ test/misc/tst-syscall6.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 test/misc/tst-syscall0.c create mode 100644 test/misc/tst-syscall1.c create mode 100644 test/misc/tst-syscall6.c diff --git a/test/misc/tst-syscall0.c b/test/misc/tst-syscall0.c new file mode 100644 index 0000000..ebfca95 --- /dev/null +++ b/test/misc/tst-syscall0.c @@ -0,0 +1,15 @@ +#include <stdio.h> +#include <unistd.h> +#include <sys/syscall.h> + +int main() { + int pid; + + pid = syscall(SYS_getpid); + if (pid > 0) { + printf("syscall(SYS_getpid) says %d\n", pid); + return 0; + } + + return 1; +} diff --git a/test/misc/tst-syscall1.c b/test/misc/tst-syscall1.c new file mode 100644 index 0000000..e3b990e --- /dev/null +++ b/test/misc/tst-syscall1.c @@ -0,0 +1,18 @@ +#include <stdio.h> +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/utsname.h> + +int main() { + int ret; + struct utsname name; + + ret = syscall(SYS_uname, &name); + if (ret == 0) { + printf("syscall(SYS_uname) says %s-%s\n", name.sysname, + name.release); + return 0; + } + + return 1; +} diff --git a/test/misc/tst-syscall6.c b/test/misc/tst-syscall6.c new file mode 100644 index 0000000..dad67d1 --- /dev/null +++ b/test/misc/tst-syscall6.c @@ -0,0 +1,61 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/uio.h> +#include <sys/types.h> +#include <linux/fs.h> /* for RWF_HIPRI */ + +int main() +{ + char tmp[] = "/tmp/tst-preadv2-XXXXXX"; + int fd; + struct iovec iov[2]; + char *str0 = "hello "; + char *str1 = "world\n"; + char input[16]; + int nio; + + fd = mkstemp (tmp); + if (fd == -1) { + puts ("mkstemp failed"); + return 1; + } + + iov[0].iov_base = str0; + iov[0].iov_len = strlen(str0); + iov[1].iov_base = str1; + iov[1].iov_len = strlen(str1) + 1; /* null terminator */ + + nio = syscall(SYS_pwritev2, fd, iov, 2, 0, 0, RWF_DSYNC); + + if (nio <= 0) { + puts ("failed to write to fd"); + return 1; + } + + /* Read in the second string into the first buffer */ + iov[0].iov_base = input; + iov[0].iov_len = strlen(str1) + 1; /* null terminator */ + nio = syscall(SYS_preadv2, fd, iov, 1, strlen(str0), 0, RWF_HIPRI); + if (nio <= 0) { + printf ("failed to read fd %d\n", nio); + return 1; + } + + if (strncmp(iov[0].iov_base, iov[1].iov_base, strlen(str1)) == 0) + printf ("syscall(SYS_preadv2) read %s", (char *) iov[0].iov_base); + + if (close(fd) != 0) { + puts ("failed to close read fd"); + return 1; + } + + if (unlink(tmp) != 0) { + puts ("failed to unlink file"); + return 1; + } + + return 0; +} -- 2.13.6

2 1

Proper test for broken posix_spawn
by Alex Potapenko 17 Dec '17

17 Dec '17

Hi Waldemar, I've recently encountered an issue with broken posix_spawn in uClibc-ng 1.0.26, which made cups 2.2.[46] unusable. Looking at commit 71b3a63b641716165f664cf112be0673a122cea0, I see that it should be fixed in 1.0.27. I have a small test code that illustrates the problem with posix_spawn, which works fine with GNU lib C, but fails with uClibc-ng 1.0.26 (see posix_spawn.c attached). If I remove POSIX_SPAWN_SETSIGDEF flag, it works OK. I can't test it with 1.0.27 yet, could you please verify that it works? Also, if it works fine, another question. What is the proper macro test for working posix_spawn (uClibc-ng version 1.0.27+)? Thank you, Alex

2 1

arc patch from glibc repo
by Waldemar Brodkorb 16 Dec '17

16 Dec '17

Hi Alexey, the attached patch fixes at least 3 test suite errors for me. tst-cancel20/21/4. Tested with latest 2017.09 ARC binutils/gcc. Okay to apply? best regards Waldemar

3 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel