December 2014 - devel

uClibc-ng - small C library for embedded systems branch master updated. 4131f1dae51993d4f3dbde91305cddc898094519
by wbx＠helium.waldemar-brodkorb.de 30 Dec '14

30 Dec '14

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, master has been updated via 4131f1dae51993d4f3dbde91305cddc898094519 (commit) from e762a60c733a668c11f9c8f8d997e7e34b8b9516 (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 4131f1dae51993d4f3dbde91305cddc898094519 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Tue Dec 30 22:25:59 2014 +0100 be sure to use EXTRA_CFLAGS for tests, too ----------------------------------------------------------------------- Summary of changes: test/Rules.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/Rules.mak b/test/Rules.mak index 805a349..c5d1d63 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -115,6 +115,12 @@ ifeq ($(LDSO_GNU_HASH_SUPPORT),y) LDFLAGS += $(CFLAG_-Wl--hash-style=gnu) endif +ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") +CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) +endif +ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"") +LDFLAGS += $(call qstrip,$(UCLIBC_EXTRA_LDFLAGS)) +endif ifneq ($(findstring -s,$(MAKEFLAGS)),) DISP := sil hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. e762a60c733a668c11f9c8f8d997e7e34b8b9516
by wbx＠helium.waldemar-brodkorb.de 30 Dec '14

30 Dec '14

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, master has been updated via e762a60c733a668c11f9c8f8d997e7e34b8b9516 (commit) from 7fa20cef3fc120c9c9fb96c46bd06feb69cef3ca (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 e762a60c733a668c11f9c8f8d997e7e34b8b9516 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Tue Dec 30 21:28:10 2014 +0100 remove another two warnings. ----------------------------------------------------------------------- Summary of changes: libc/stdio/__fpending.c | 7 ------- libc/sysdeps/linux/common/bits/uClibc_fpmax.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/libc/stdio/__fpending.c b/libc/stdio/__fpending.c index a7fe054..e7e33e8 100644 --- a/libc/stdio/__fpending.c +++ b/libc/stdio/__fpending.c @@ -18,13 +18,6 @@ * convert wide chars to their multibyte encodings and buffer _those_. */ -#ifdef __UCLIBC_HAS_WCHAR__ -#warning Note: Unlike the glibc version, this __fpending returns bytes in buffer for wide streams too! - -link_warning(__fpending, "This version of __fpending returns bytes remaining in buffer for both narrow and wide streams. glibc's version returns wide chars in buffer for the wide stream case.") - -#endif - size_t __fpending(register FILE * __restrict stream) { __STDIO_STREAM_VALIDATE(stream); diff --git a/libc/sysdeps/linux/common/bits/uClibc_fpmax.h b/libc/sysdeps/linux/common/bits/uClibc_fpmax.h index bbea1ae..b7dcee1 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_fpmax.h +++ b/libc/sysdeps/linux/common/bits/uClibc_fpmax.h @@ -68,10 +68,6 @@ typedef float __fpmax_t; #ifndef DECIMAL_DIG -#ifdef L___strtofpmax -/* Emit warning only once. */ -#warning DECIMAL_DIG is not defined! If you are using gcc, it may not be defining __STDC_VERSION__ as it should. -#endif #if !defined(FLT_RADIX) || (FLT_RADIX != 2) #error unable to compensate for missing DECIMAL_DIG! #endif hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. 7fa20cef3fc120c9c9fb96c46bd06feb69cef3ca
by wbx＠helium.waldemar-brodkorb.de 30 Dec '14

30 Dec '14

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, master has been updated via 7fa20cef3fc120c9c9fb96c46bd06feb69cef3ca (commit) via 5e0ada6a23c683851b8e20ee7ade0cee7a9b4900 (commit) from 3d39f1ae2b2bb9f2aa30eee4b34486b03e24c175 (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 7fa20cef3fc120c9c9fb96c46bd06feb69cef3ca Merge: 5e0ada6 3d39f1a Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Tue Dec 30 18:34:38 2014 +0100 Merge branch 'master' of git+ssh://openadk.org/git/uclibc-ng commit 5e0ada6a23c683851b8e20ee7ade0cee7a9b4900 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Tue Dec 30 18:34:30 2014 +0100 reenable c6x for toolchain testing without NPTL ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 5d0f4f0..2a8c006 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -62,8 +62,8 @@ config TARGET_bfin # someone could sync this tree: # http://linux-c6x.org/git/?p=uClibc.git;a=summary -#config TARGET_c6x -# bool "c6x" +config TARGET_c6x + bool "c6x" config TARGET_cris bool "cris" hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. 3d39f1ae2b2bb9f2aa30eee4b34486b03e24c175
by wbx＠helium.waldemar-brodkorb.de 29 Dec '14

29 Dec '14

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, master has been updated via 3d39f1ae2b2bb9f2aa30eee4b34486b03e24c175 (commit) via c5722d63ede04b656c7ac8607d075db576a226d8 (commit) via 6fc08ddc732c8c0a56391d30d4e86aa46bda5495 (commit) via c08e51d9a9a598e31bf4dcc51afa52388ee99050 (commit) via e6ab5f05c89550d15e07e9eab2e2623494f60dca (commit) from b7967026760157bbbfc4fb9db6862cd2085bb0d9 (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 3d39f1ae2b2bb9f2aa30eee4b34486b03e24c175 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 23:08:54 2014 -0600 remove comment commit c5722d63ede04b656c7ac8607d075db576a226d8 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 23:05:39 2014 -0600 reduce some unneeded warnings. commit 6fc08ddc732c8c0a56391d30d4e86aa46bda5495 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 22:55:38 2014 -0600 remove hidden warning option, not useful for others. commit c08e51d9a9a598e31bf4dcc51afa52388ee99050 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 22:51:58 2014 -0600 fix warning when doing make clean commit e6ab5f05c89550d15e07e9eab2e2623494f60dca Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 22:51:11 2014 -0600 update INSTALL ----------------------------------------------------------------------- Summary of changes: INSTALL | 46 ++++++++++++++++++++++------------------------ Rules.mak | 3 --- extra/Configs/Config.in | 7 ------- libc/stdio/_stdio.c | 1 - libc/stdio/fflush.c | 2 -- libc/stdio/popen.c | 2 -- test/unistd/Makefile.in | 4 +++- 7 files changed, 25 insertions(+), 40 deletions(-) diff --git a/INSTALL b/INSTALL index 78fe3fc..058c021 100644 --- a/INSTALL +++ b/INSTALL @@ -1,21 +1,20 @@ SOFTWARE REQUIREMENTS - Compiling uClibc requires Linux kernel header files. uClibc will + Compiling uClibc-ng requires Linux kernel header files. uClibc-ng will be compiled to match the interfaces available in the provided - version of the Linux kernel headers. Linux kernel version 2.0, - version 2.2, version 2.4 and version 2.6 are known to work. Other - kernel versions may work but haven't been tested. Its also helpful - to have a working version of GNU binutils, and GNU gcc -- using - excessively old versions of these packages can cause very strange - errors that are difficult to find and fix. + version of the Linux kernel headers. Linux kernel version 3.x is + supported. + Its also helpful to have a working version of GNU binutils, and + GNU gcc -- using excessively old versions of these packages can + cause very strange errors that are difficult to find and fix. -CONFIGURING uClibc: +CONFIGURING uClibc-ng: - - Users must have a valid configuration file to compile uClibc. Do not + - Users must have a valid configuration file to compile uClibc-ng. Do not skip this step. New configuration options are added in each release, and odd configuration options are sometimes removed. - To configure uClibc, you can run: + To configure uClibc-ng, you can run: make menuconfig or @@ -39,10 +38,10 @@ CONFIGURING uClibc: "make allnoconfig" Set all values to "no" for all options. -COMPILING uClibc: +COMPILING uClibc-ng: - - uClibc does not have proper dependancy checking (yet) so if you - change your uClibc configuration, you must current rebuild the + - uClibc-ng does not have proper dependancy checking so if you + change your uClibc-ng configuration, you must current rebuild the entire library, by first running make clean @@ -51,30 +50,29 @@ COMPILING uClibc: make - to compile uClibc. or if you are cross compiling, you would + to compile uClibc-ng. or if you are cross compiling, you would instead run something like: make CROSS_COMPILE=arm-linux- -INSTALLING the uClibc development environment: +INSTALLING the uClibc-ng development environment: - As root, if necessary, run something like: make PREFIX=<some path> install - This will install the uClibc runtime and development system (i.e. + This will install the uClibc-ng runtime and development system (i.e. all the header files, libraries, etc) into the directories defined within your .config file. -USING uClibc: +USING uClibc-ng: - - To compile programs with uClibc you will need a complete toolchain - (i.e. binutils, gcc, and uClibc) that was built expressly for use - with uClibc. + - To compile programs with uClibc-ng you will need a complete toolchain + (i.e. binutils, gcc and uClibc-ng) that was built expressly for use + with uClibc-ng. - - Native and cross compiling toolchains, as well as makefiles for creating - uClibc toolchains, are available from the uClibc website. You may want - to check out "buildroot", which is available from the uClibc download area, - which provides examples of how to build your own uClibc based system. + - You have two choices at the moment: + - Use OpenADK from http://www.openadk.org + - Use your own build scripts or environment diff --git a/Rules.mak b/Rules.mak index 218eb1f..2a73d7f 100644 --- a/Rules.mak +++ b/Rules.mak @@ -67,9 +67,6 @@ AWK = awk STRIP_FLAGS ?= -x -R .note -R .comment -## unused? if yes, remove after 0.9.31 -## UNIFDEF := $(top_builddir)extra/scripts/unifdef - # Select the compiler needed to build binaries for your development system HOSTCC = gcc BUILD_CFLAGS = -Os diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index fab0ddc..5d0f4f0 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -2483,11 +2483,4 @@ config DOMULTI If unsure, keep the default of N. -config UCLIBC_MJN3_ONLY - bool "Manuel's hidden warnings" - help - Answer Y here to see all Manuel's personal notes, warnings, and todos. - - Most people will answer N. - endmenu diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c index 388a211..ee247a5 100644 --- a/libc/stdio/_stdio.c +++ b/libc/stdio/_stdio.c @@ -195,7 +195,6 @@ void _stdio_term(void) * chain might be corrupt due to a partial store. */ STDIO_INIT_MUTEX(_stdio_openlist_add_lock); -#warning check #ifdef __STDIO_BUFFERS STDIO_INIT_MUTEX(_stdio_openlist_del_lock); #endif diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c index d9104a4..cf0356a 100644 --- a/libc/stdio/fflush.c +++ b/libc/stdio/fflush.c @@ -97,8 +97,6 @@ int fflush_unlocked(register FILE *stream) while(stream) { /* We only care about currently writing streams and do not want to * block trying to obtain mutexes on non-writing streams. */ -#warning fix for nonatomic -#warning unnecessary check if no threads if (__STDIO_STREAM_IS_WRITING(stream)) { /* ONLY IF ATOMIC!!! */ __MY_STDIO_THREADLOCK(stream); /* Need to check again once we have the lock. */ diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c index 40a6dda..e1b1d40 100644 --- a/libc/stdio/popen.c +++ b/libc/stdio/popen.c @@ -124,8 +124,6 @@ FILE *popen(const char *command, const char *modes) return NULL; } -#warning is pclose correct wrt the new mutex semantics? - int pclose(FILE *stream) { struct popen_list_item *p; diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in index 44ff360..6f8a274 100644 --- a/test/unistd/Makefile.in +++ b/test/unistd/Makefile.in @@ -1,9 +1,10 @@ # uClibc unistd tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +TESTS_DISABLED := # If LFS is not set, get rid of all *64 tests up front ifeq ($(UCLIBC_HAS_LFS),) -TESTS_DISABLED := tst-preadwrite64 tst-posix_fallocate64 tst-fallocate64 +TESTS_DISABLED += tst-preadwrite64 tst-fallocate64 endif # If we don't have LINUX_SPECIFIC, then get rid of tst-fallocate @@ -29,6 +30,7 @@ else # reordering is not supported, behaves as if POSIXLY_CORRECT would be set OPTS_tstgetopt := -a -b -cfoobar --required foobar --optional=bazbug --none --colou --color --colour random endif + # for embedded systems 4 GB disk space is not available TESTS_DISABLED += tst-posix_fallocate64 hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. b7967026760157bbbfc4fb9db6862cd2085bb0d9
by wbx＠helium.waldemar-brodkorb.de 29 Dec '14

29 Dec '14

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, master has been updated via b7967026760157bbbfc4fb9db6862cd2085bb0d9 (commit) from 5f7dc9b62575cfab781abda80602515ce42b43e8 (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 b7967026760157bbbfc4fb9db6862cd2085bb0d9 Author: Waldemar Brodkorb <wbx(a)openadk.org> Date: Sun Dec 28 22:10:35 2014 -0600 revert getopt changes to tests The upstream changes are not complete and let the tests fail. Revert the changes for now, may be upstream will make a better fix later. ----------------------------------------------------------------------- Summary of changes: test/nptl/tst-cancel7.c | 7 ++----- test/nptl/tst-mqueue7.c | 5 +---- test/test-skeleton.c | 10 +--------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c index fe543f7..3bdfa9f 100644 --- a/test/nptl/tst-cancel7.c +++ b/test/nptl/tst-cancel7.c @@ -196,16 +196,13 @@ do_cleanup (void) #define OPT_COMMAND 10000 #define OPT_PIDFILE 10001 #define CMDLINE_OPTIONS \ - "c:p:" -/* { "command", required_argument, NULL, OPT_COMMAND }, \ { "pidfile", required_argument, NULL, OPT_PIDFILE }, -*/ #define CMDLINE_PROCESS \ - case 'c': \ + case OPT_COMMAND: \ command = optarg; \ break; \ - case 'p': \ + case OPT_PIDFILE: \ pidfile = optarg; \ break; // #define CLEANUP_HANDLER do_cleanup () diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c index 01d7cd7..d1a6529 100644 --- a/test/nptl/tst-mqueue7.c +++ b/test/nptl/tst-mqueue7.c @@ -32,12 +32,9 @@ static mqd_t after_exec = (mqd_t) -1; #define CMDLINE_OPTIONS \ - "a:" -/* { "after-exec", required_argument, NULL, OPT_AFTEREXEC }, -*/ #define CMDLINE_PROCESS \ - case 'a': \ + case OPT_AFTEREXEC: \ after_exec = (mqd_t) strtoul (optarg, NULL, 0); \ break; diff --git a/test/test-skeleton.c b/test/test-skeleton.c index 69ef99f..cf7afea 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -18,6 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> +#include <getopt.h> #include <malloc.h> #include <search.h> #include <signal.h> @@ -45,7 +46,6 @@ #define OPT_DIRECT 1000 #define OPT_TESTDIR 1001 -#if 0 /* Not used in uClibc */ static struct option options[] = { #ifdef CMDLINE_OPTIONS @@ -55,7 +55,6 @@ static struct option options[] = { "test-dir", required_argument, NULL, OPT_TESTDIR }, { NULL, 0, NULL, 0 } }; -#endif /* PID of the test itself. */ static pid_t pid; @@ -242,14 +241,7 @@ main (int argc, char *argv[]) setbuf (stdout, NULL); #endif -#if 0 /* Not used in uClibc */ while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1) -#else -# ifndef CMDLINE_OPTIONS -# define CMDLINE_OPTIONS "" -# endif - while ((opt = getopt (argc, argv, "+" CMDLINE_OPTIONS)) >= 0) -#endif switch (opt) { case '?': hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. 5f7dc9b62575cfab781abda80602515ce42b43e8
by wbx＠helium.waldemar-brodkorb.de 28 Dec '14

28 Dec '14

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, master has been updated via 5f7dc9b62575cfab781abda80602515ce42b43e8 (commit) from 33b126af0e3036d554ef993acfe3f204066e2376 (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 5f7dc9b62575cfab781abda80602515ce42b43e8 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Dec 28 21:33:35 2014 +0100 for mips64 with N32 ABI we need to use newfstatat Fixes compile errors with latest util-linux. ----------------------------------------------------------------------- Summary of changes: libc/sysdeps/linux/common/fstatat64.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c index 015f57d..711521a 100644 --- a/libc/sysdeps/linux/common/fstatat64.c +++ b/libc/sysdeps/linux/common/fstatat64.c @@ -10,10 +10,18 @@ #include <bits/wordsize.h> #include <sys/syscall.h> +#if defined __mips__ +# include <sgidefs.h> +#endif + /* 64bit ports tend to favor newfstatat() */ #if __WORDSIZE == 64 && defined __NR_newfstatat # define __NR_fstatat64 __NR_newfstatat #endif +/* mips N32 ABI use newfstatat(), too */ +#if defined __mips__ && _MIPS_SIM == _ABIN32 +# define __NR_fstatat64 __NR_newfstatat +#endif #ifdef __NR_fstatat64 # include <sys/stat.h> hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. 33b126af0e3036d554ef993acfe3f204066e2376
by wbx＠helium.waldemar-brodkorb.de 28 Dec '14

28 Dec '14

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, master has been updated via 33b126af0e3036d554ef993acfe3f204066e2376 (commit) from cfc523ea8d207ebfd3cf683120d34527b6d08cb6 (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 33b126af0e3036d554ef993acfe3f204066e2376 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Dec 28 17:09:15 2014 +0100 relocation fixes From OpenWrt: https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.33.2/613… ----------------------------------------------------------------------- Summary of changes: ldso/ldso/mips/elfinterp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index dfe37c5..6310c77 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -239,12 +239,12 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, case R_MIPS_TLS_DTPMOD64: case R_MIPS_TLS_DTPMOD32: if (tls_tpnt) - *(ElfW(Word) *)reloc_addr = tls_tpnt->l_tls_modid; + *(ElfW(Addr) *)reloc_addr = tls_tpnt->l_tls_modid; break; case R_MIPS_TLS_DTPREL64: case R_MIPS_TLS_DTPREL32: - *(ElfW(Word) *)reloc_addr += + *(ElfW(Addr) *)reloc_addr += TLS_DTPREL_VALUE (symbol_addr); break; hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. cfc523ea8d207ebfd3cf683120d34527b6d08cb6
by wbx＠helium.waldemar-brodkorb.de 28 Dec '14

28 Dec '14

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, master has been updated via cfc523ea8d207ebfd3cf683120d34527b6d08cb6 (commit) from e6faae7a3082a7a09626ce579da16d7b12fab2bf (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 cfc523ea8d207ebfd3cf683120d34527b6d08cb6 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Dec 28 17:02:28 2014 +0100 sparc64 support was removed recently Remove leftover code. ----------------------------------------------------------------------- Summary of changes: ldso/include/dl-syscall.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 675b93a..6a89dff 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -25,11 +25,7 @@ extern int _dl_errno; /* Pull in whatever this particular arch's kernel thinks the kernel version of * struct stat should look like. It turns out that each arch has a different * opinion on the subject, and different kernel revs use different names... */ -#if defined(__sparc_v9__) && (__WORDSIZE == 64) -#define kernel_stat64 stat -#else #define kernel_stat stat -#endif #include <bits/kernel_stat.h> #include <bits/kernel_types.h> hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. e6faae7a3082a7a09626ce579da16d7b12fab2bf
by wbx＠helium.waldemar-brodkorb.de 26 Dec '14

26 Dec '14

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, master has been updated via e6faae7a3082a7a09626ce579da16d7b12fab2bf (commit) from da932d59161a2d833596be5443c81ff244d2db58 (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 e6faae7a3082a7a09626ce579da16d7b12fab2bf Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Fri Dec 26 18:43:07 2014 +0100 don't optimize for special mips cpu When building optimized code for Lemote Yeelong system, a conflict occurs. Better use optimized flags in your buildsystem, not in uClibc-ng. ----------------------------------------------------------------------- Summary of changes: Rules.mak | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Rules.mak b/Rules.mak index 72e55f5..218eb1f 100644 --- a/Rules.mak +++ b/Rules.mak @@ -404,14 +404,6 @@ endif ifeq ($(TARGET_ARCH),mips) OPTIMIZATION+=-mno-split-addresses - CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32R2)+=-march=mips32r2 -mtune=mips32r2 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64R2)+=-mips64r2 -mtune=mips64r2 ifeq ($(strip $(ARCH_BIG_ENDIAN)),y) CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64btsmip CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32btsmip hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. da932d59161a2d833596be5443c81ff244d2db58
by wbx＠helium.waldemar-brodkorb.de 25 Dec '14

25 Dec '14

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, master has been updated via da932d59161a2d833596be5443c81ff244d2db58 (commit) via 638a23483b40c5b606ee323e6612e7e454e5154b (commit) via bff3a664e6a2a367bf159c3089df1fe6f093bfb1 (commit) via f8e05f3850e51673522216f23533bf7146359dcd (commit) via 067637375658047d70c296606ae17ef0bc86499d (commit) via d6da534cbf05dc4d09221881afd49b275ca7cd29 (commit) via 926a698c5ac69b599014ce147cc814343f0aaa4f (commit) from 88842f7126daccf205204be05d3143c73fa0624d (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 da932d59161a2d833596be5443c81ff244d2db58 Merge: 88842f7 638a234 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Thu Dec 25 22:48:20 2014 +0100 merge upstream changes ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- extra/Configs/Config.in | 28 +++++++++---------- extra/config/conf.c | 5 ++-- include/getopt.h | 2 +- libc/stdio/_fpmaxtostr.c | 13 ++++----- libc/sysdeps/linux/common/bits/getopt.h | 2 +- libc/unistd/Makefile.in | 14 +++++++--- libc/unistd/getopt.c | 2 ++ test/Rules.mak | 3 +++ test/misc/Makefile.in | 8 ++++++ test/misc/bug-glob2.c | 1 - test/misc/tst-inotify.c | 7 +++-- test/misc/tst-utmp.c | 45 +++++++++++++++++-------------- test/nptl/tst-cancel7.c | 7 +++-- test/nptl/tst-mqueue7.c | 6 +++-- test/pwd_grp/getgroups.c | 11 ++++---- test/stdlib/Makefile.in | 5 ++-- test/stdlib/test-mkostemp-O_CLOEXEC.c | 5 ++++ test/test-skeleton.c | 17 +++++++++++- 19 files changed, 116 insertions(+), 67 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3b8e043..5d60dda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -276,7 +276,7 @@ HEADERS_RM-$(UCLIBC_HAS_GETTEXT_AWARENESS) += libintl.h HEADERS_RM-$(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF) += printf.h HEADERS_RM-$(UCLIBC_HAS_GLOB) += glob.h HEADERS_RM-$(UCLIBC_HAS_GNU_ERROR) += error.h -HEADERS_RM-$(UCLIBC_HAS_GNU_GETOPT)$(UCLIBC_HAS_GETOPT_LONG) += getopt.h +HEADERS_RM-$(UCLIBC_HAS_GETOPT_LONG) += getopt.h HEADERS_RM-$(UCLIBC_HAS_IPV6) += netinet/ip6.h netinet/icmp6.h HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 2dbd455..fab0ddc 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1449,6 +1449,13 @@ config UCLIBC_HAS_STRING_ARCH_OPT These are small and fast, the only reason _not_ to say Y here is for debugging purposes. +config UCLIBC_HAS_STDIO_FUTEXES + bool "Use futexes for multithreaded I/O locking" + depends on UCLIBC_HAS_THREADS_NATIVE + help + If you want to compile uClibc to use futexes for low-level + I/O locking, answer Y. Otherwise, answer N. + config UCLIBC_HAS_CTYPE_TABLES bool "Use Table Versions Of 'ctype.h' Functions." default y @@ -1905,32 +1912,25 @@ config UCLIBC_HAS_GNU_GETOPT help Answer Y if you want to include full gnu getopt() instead of a (much smaller) SUSv3 compatible getopt(). + Note that getopt_long, getopt_long_only as well as getsubopt + are implemented on top of this choice. Most people will answer Y. -config UCLIBC_HAS_STDIO_FUTEXES - bool "Use futexes for multithreaded I/O locking" - depends on UCLIBC_HAS_THREADS_NATIVE - help - If you want to compile uClibc to use futexes for low-level - I/O locking, answer Y. Otherwise, answer N. - config UCLIBC_HAS_GETOPT_LONG - bool "Support getopt_long/getopt_long_only" - depends on !UCLIBC_HAS_GNU_GETOPT + bool "Support getopt_long/getopt_long_only (glibc-compat)" default y help - Answer Y if you want to include getopt_long[_only() used by many - apps, even busybox. + Answer Y if you want to include getopt_long[_only()] used by many + apps. Most people will answer Y. config UCLIBC_HAS_GNU_GETSUBOPT - bool "Support glibc getsubopt" + bool "Support getsubopt" default y help - Answer Y if you want to include glibc getsubopt() instead of a - smaller SUSv3 compatible getsubopt(). + Answer Y if you want to include getsubopt(). Most people will answer Y. endmenu diff --git a/extra/config/conf.c b/extra/config/conf.c index db09053..b24c1c3 100644 --- a/extra/config/conf.c +++ b/extra/config/conf.c @@ -10,7 +10,6 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <getopt.h> #include <sys/stat.h> #include <sys/time.h> #include <errno.h> @@ -447,7 +446,7 @@ static void check_conf(struct menu *menu) } #if 00 // || !defined __UCLIBC__ || \ - (defined UCLIBC_HAS_GETOPT_LONG || defined UCLIBC_HAS_GNU_GETOPT) + defined __UCLIBC_HAS_GETOPT_LONG__ static struct option long_opts[] = { {"oldaskconfig", no_argument, NULL, oldaskconfig}, {"oldconfig", no_argument, NULL, oldconfig}, @@ -526,7 +525,7 @@ int main(int ac, char **av) tty_stdio = isatty(0) && isatty(1) && isatty(2); #if 00// !defined __UCLIBC__ || \ - (defined UCLIBC_HAS_GETOPT_LONG || defined UCLIBC_HAS_GNU_GETOPT) + defined __UCLIBC_HAS_GETOPT_LONG__ while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) #else char *gch = "asonymArDSld"; diff --git a/include/getopt.h b/include/getopt.h index a682f9c..de9da26 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -1,4 +1,4 @@ -/* This file will not be installed if not using gnu getopt. */ +/* This file will not be installed if not using getopt_long. */ #include <bits/getopt.h> diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c index f7ea792..3580584 100644 --- a/libc/stdio/_fpmaxtostr.c +++ b/libc/stdio/_fpmaxtostr.c @@ -45,11 +45,6 @@ */ #define isnan(x) ((x) != (x)) -/* Without seminumerical functions to examine the sign bit, this is - * about the best we can do to test for '-0'. - */ -#define zeroisnegative(x) ((1./(x)) < 0) - /*****************************************************************************/ /* Don't change anything that follows peroid!!! ;-) */ /*****************************************************************************/ @@ -262,7 +257,13 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, if (x == 0) { /* Handle 0 now to avoid false positive. */ #ifdef __UCLIBC_HAVE_SIGNED_ZERO__ - if (zeroisnegative(x)) { /* Handle 'signed' zero. */ + union { + double x; + struct { + unsigned int l1, l2; + } i; + } u = {x}; + if (u.i.l1 ^ u.i.l2) { /* Handle 'signed' zero. */ *sign_str = '-'; } #endif /* __UCLIBC_HAVE_SIGNED_ZERO__ */ diff --git a/libc/sysdeps/linux/common/bits/getopt.h b/libc/sysdeps/linux/common/bits/getopt.h index a49f023..dababe0 100644 --- a/libc/sysdeps/linux/common/bits/getopt.h +++ b/libc/sysdeps/linux/common/bits/getopt.h @@ -126,7 +126,7 @@ extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) __THROW; libc_hidden_proto(getopt) -#if defined __UCLIBC_HAS_GNU_GETOPT__ || defined __UCLIBC_HAS_GETOPT_LONG__ +#if defined __UCLIBC_HAS_GETOPT_LONG__ #ifndef __need_getopt extern int getopt_long (int ___argc, char *const *___argv, const char *__shortopts, diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index b15d60a..659008d 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -16,10 +16,16 @@ OMIT-$(ARCH_USE_MMU) += __exec_alloc.c OMIT-$(if $(UCLIBC_SUSV3_LEGACY),,y) += ualarm.c usleep.c #OMIT-$(UCLIBC_HAS_THREADS_NATIVE) += sleep.c -# XXX: GNU_GETOPT comes with getopt_long unconditionally, which is wrong -GO_LONG := $(if $(UCLIBC_HAS_GNU_GETOPT),getopt_long-simple.c) -OMIT-y += $(if $(UCLIBC_HAS_GNU_GETOPT),getopt-susv3.c $(GO_LONG),getopt.c) -OMIT-y += $(if $(UCLIBC_HAS_GNU_GETSUBOPT),getsubopt-susv3.c,getsubopt.c) +ifeq ($(UCLIBC_HAS_GNU_GETOPT),y) +# GNU getopt family +OMIT-y += getopt-susv3.c getopt_long-simple.c getsubopt-susv3.c +OMIT-y += $(if $(UCLIBC_HAS_GNU_GETSUBOPT),,getsubopt.c) +else +# SuS getopt family +OMIT-y += getopt.c getsubopt.c +OMIT-y += $(if $(UCLIBC_HAS_GETOPT_LONG),,getopt_long-simple.c) +OMIT-y += $(if $(UCLIBC_HAS_GNU_GETSUBOPT),,getsubopt-susv3.c) +endif CSRC-y := $(filter-out $(OMIT-y),$(CSRC-y)) diff --git a/libc/unistd/getopt.c b/libc/unistd/getopt.c index 3944c7c..f63482b 100644 --- a/libc/unistd/getopt.c +++ b/libc/unistd/getopt.c @@ -1162,6 +1162,7 @@ getopt (int argc, char *const *argv, const char *optstring) } libc_hidden_def(getopt) +#if defined __UCLIBC_HAS_GETOPT_LONG__ int getopt_long (int argc, char *const *argv, const char *options, const struct option *long_options, int *opt_index) @@ -1180,5 +1181,6 @@ getopt_long_only (int argc, char *const *argv, const char *options, { return _getopt_internal (argc, argv, options, long_options, opt_index, 1); } +#endif /* __UCLIBC_HAS_GETOPT_LONG__ */ #endif /* Not ELIDE_CODE. */ diff --git a/test/Rules.mak b/test/Rules.mak index ed72db2..805a349 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -78,6 +78,9 @@ CFLAGS := -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include CFLAGS += $(XCOMMON_CFLAGS) $(KERNEL_INCLUDES) $(CC_INC) CFLAGS += $(OPTIMIZATION) $(CPU_CFLAGS) $(XWARNINGS) +$(eval $(call check-gcc-var,-Wno-missing-field-initializers)) +CFLAGS += $(CFLAG_-Wno-missing-field-initializers) + # Can't add $(OPTIMIZATION) here, it may be target-specific. # Just adding -Os for now. HOST_CFLAGS += $(XCOMMON_CFLAGS) -Os $(XWARNINGS) -std=gnu99 diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in index 3dfe617..04b677f 100644 --- a/test/misc/Makefile.in +++ b/test/misc/Makefile.in @@ -13,6 +13,14 @@ TESTS_DISABLED += tst-statfs # assuming host has LFS on endif CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +ifeq ($(UCLIBC_LINUX_SPECIFIC),) +TESTS_DISABLED += tst-inotify +endif + +ifeq ($(UCLIBC_HAS_GLOB),) +TESTS_DISABLED += bug-glob2 +endif + DODIFF_dirent := 1 DODIFF_dirent64 := 1 DODIFF_tst-statfs := 1 diff --git a/test/misc/bug-glob2.c b/test/misc/bug-glob2.c index 98e3bf7..069891b 100644 --- a/test/misc/bug-glob2.c +++ b/test/misc/bug-glob2.c @@ -18,7 +18,6 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <error.h> #include <dirent.h> #include <glob.h> #include <stdlib.h> diff --git a/test/misc/tst-inotify.c b/test/misc/tst-inotify.c index 9d940f7..f9f6830 100644 --- a/test/misc/tst-inotify.c +++ b/test/misc/tst-inotify.c @@ -11,7 +11,6 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <error.h> #include <inttypes.h> #include <sys/inotify.h> #include <sys/fcntl.h> @@ -39,7 +38,7 @@ do_test(void) /* nonblocking inotify should return immediately with no events */ ret = read(ifd, &e, sizeof(e)); if (ret != -1 || errno != EAGAIN) { - error(0, 0, "first read() returned %d", ret); + fprintf(stderr, "first read() returned %d\n", ret); result = 1; } @@ -49,12 +48,12 @@ do_test(void) /* now check whether our event was seen */ ret = read(ifd, &e, sizeof(e)); if (ret != sizeof(e)) { - error(0, 0, "second read() returned %d", ret); + fprintf(stderr, "second read() returned %d\n", ret); result = 1; } if (!(e.mask & IN_DELETE_SELF)) { - error(0, 0, "incorrect event mask: %" PRIx32, e.mask); + fprintf(stderr, "incorrect event mask: %" PRIx32 "\n", e.mask); result = 1; } diff --git a/test/misc/tst-utmp.c b/test/misc/tst-utmp.c index ca92cf2..08a6f8e 100644 --- a/test/misc/tst-utmp.c +++ b/test/misc/tst-utmp.c @@ -18,7 +18,6 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <error.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> @@ -69,8 +68,11 @@ do_prepare (int argc, char *argv[]) /* Open our test file. */ fd = mkstemp (name); - if (fd == -1) - error (EXIT_FAILURE, errno, "cannot open test file `%s'", name); + if (fd == -1) { + fprintf (stderr, "cannot open test file `%s': ", name); + perror (NULL); + exit (EXIT_FAILURE); + } } struct utmp entry[] = @@ -110,7 +112,7 @@ do_init (void) { if (pututline (&entry[n]) == NULL) { - error (0, errno, "cannot write UTMP entry"); + perror ("cannot write UTMP entry"); return 1; } } @@ -135,7 +137,7 @@ do_check (void) if (n < num_entries && memcmp (ut, &entry[n], sizeof (struct utmp))) { - error (0, 0, "UTMP entry does not match"); + fprintf (stderr, "UTMP entry does not match\n"); return 1; } @@ -144,7 +146,7 @@ do_check (void) if (n != num_entries) { - error (0, 0, "number of UTMP entries is incorrect"); + fprintf (stderr, "number of UTMP entries is incorrect\n"); return 1; } @@ -176,7 +178,7 @@ simulate_login (const char *line, const char *user) if (pututline (&entry[n]) == NULL) { - error (0, errno, "cannot write UTMP entry"); + perror ("cannot write UTMP entry"); return 1; } @@ -186,7 +188,7 @@ simulate_login (const char *line, const char *user) } } - error (0, 0, "no entries available"); + fprintf (stderr, "no entries available\n"); return 1; } @@ -210,7 +212,7 @@ simulate_logout (const char *line) if (pututline (&entry[n]) == NULL) { - error (0, errno, "cannot write UTMP entry"); + perror ("cannot write UTMP entry"); return 1; } @@ -220,7 +222,7 @@ simulate_logout (const char *line) } } - error (0, 0, "no entry found for `%s'", line); + fprintf (stderr, "no entry found for `%s'\n", line); return 1; } @@ -237,7 +239,8 @@ check_login (const char *line) up = getutline (&ut); if (up == NULL) { - error (0, errno, "cannot get entry for line `%s'", line); + fprintf (stderr, "cannot get entry for line `%s': ", line); + perror(NULL); return 1; } @@ -249,7 +252,7 @@ check_login (const char *line) { if (memcmp (up, &entry[n], sizeof (struct utmp))) { - error (0, 0, "UTMP entry does not match"); + fprintf (stderr, "UTMP entry does not match\n"); return 1; } @@ -257,7 +260,7 @@ check_login (const char *line) } } - error (0, 0, "bogus entry for line `%s'", line); + fprintf (stderr, "bogus entry for line `%s'\n", line); return 1; } @@ -271,7 +274,7 @@ check_logout (const char *line) strcpy (ut.ut_line, line); if (getutline (&ut) != NULL) { - error (0, 0, "bogus login entry for `%s'", line); + fprintf (stderr, "bogus login entry for `%s'\n", line); return 1; } @@ -294,7 +297,8 @@ check_id (const char *id) up = getutid (&ut); if (up == NULL) { - error (0, errno, "cannot get entry for ID `%s'", id); + fprintf (stderr, "cannot get entry for ID `%s': ", id); + perror (NULL); return 1; } @@ -306,7 +310,7 @@ check_id (const char *id) { if (memcmp (up, &entry[n], sizeof (struct utmp))) { - error (0, 0, "UTMP entry does not match"); + fprintf (stderr, "UTMP entry does not match\n"); return 1; } @@ -314,7 +318,7 @@ check_id (const char *id) } } - error (0, 0, "bogus entry for ID `%s'", id); + fprintf (stderr, "bogus entry for ID `%s'\n", id); return 1; } @@ -331,7 +335,8 @@ check_type (int type) up = getutid (&ut); if (up == NULL) { - error (0, errno, "cannot get entry for type `%d'", type); + fprintf (stderr, "cannot get entry for type `%d': ", type); + perror (NULL); return 1; } @@ -343,7 +348,7 @@ check_type (int type) { if (memcmp (up, &entry[n], sizeof (struct utmp))) { - error (0, 0, "UTMP entry does not match"); + fprintf (stderr, "UTMP entry does not match\n"); return 1; } @@ -351,7 +356,7 @@ check_type (int type) } } - error (0, 0, "bogus entry for type `%d'", type); + fprintf (stderr, "bogus entry for type `%d'\n", type); return 1; } diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c index 3bdfa9f..fe543f7 100644 --- a/test/nptl/tst-cancel7.c +++ b/test/nptl/tst-cancel7.c @@ -196,13 +196,16 @@ do_cleanup (void) #define OPT_COMMAND 10000 #define OPT_PIDFILE 10001 #define CMDLINE_OPTIONS \ + "c:p:" +/* { "command", required_argument, NULL, OPT_COMMAND }, \ { "pidfile", required_argument, NULL, OPT_PIDFILE }, +*/ #define CMDLINE_PROCESS \ - case OPT_COMMAND: \ + case 'c': \ command = optarg; \ break; \ - case OPT_PIDFILE: \ + case 'p': \ pidfile = optarg; \ break; // #define CLEANUP_HANDLER do_cleanup () diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c index e8d53ad..01d7cd7 100644 --- a/test/nptl/tst-mqueue7.c +++ b/test/nptl/tst-mqueue7.c @@ -32,10 +32,12 @@ static mqd_t after_exec = (mqd_t) -1; #define CMDLINE_OPTIONS \ + "a:" +/* { "after-exec", required_argument, NULL, OPT_AFTEREXEC }, - +*/ #define CMDLINE_PROCESS \ - case OPT_AFTEREXEC: \ + case 'a': \ after_exec = (mqd_t) strtoul (optarg, NULL, 0); \ break; diff --git a/test/pwd_grp/getgroups.c b/test/pwd_grp/getgroups.c index 5769b18..c343552 100644 --- a/test/pwd_grp/getgroups.c +++ b/test/pwd_grp/getgroups.c @@ -13,7 +13,6 @@ #include <sys/types.h> #include <pwd.h> #include <grp.h> -#include <err.h> /* The number of errors encountered so far. */ static int problems = 0; @@ -25,7 +24,7 @@ static void print_group(gid_t gid) grp = getgrgid(gid); if (grp == NULL) { - warn("cannot find name for group ID %u", gid); + fprintf(stderr, "cannot find name for group ID %u\n", gid); problems++; } @@ -46,12 +45,14 @@ static int xgetgroups(gid_t gid, int *n_groups, gid_t ** groups) /* Add 1 just in case max_n_groups is zero. */ g = (gid_t *) malloc(max_n_groups * sizeof(gid_t) + 1); - if (g == NULL) - err(EXIT_FAILURE, "out of memory"); + if (g == NULL) { + fprintf(stderr, "out of memory\n"); + exit(EXIT_FAILURE); + } ng = getgroups(max_n_groups, g); if (ng < 0) { - warn("cannot get supplemental group list"); + fprintf(stderr, "cannot get supplemental group list\n"); ++fail; free(g); } diff --git a/test/stdlib/Makefile.in b/test/stdlib/Makefile.in index b0c724a..135db6b 100644 --- a/test/stdlib/Makefile.in +++ b/test/stdlib/Makefile.in @@ -6,6 +6,7 @@ DODIFF_testatexit := 1 DODIFF_teston_exit := 1 DODIFF_teststrtol := 1 -ifeq ($(ARCH_USE_MMU),) -TESTS_DISABLED := test-mkostemp-O_CLOEXEC +TESTS_DISABLED := +ifeq ($(UCLIBC_HAS_PTY),) +TESTS_DISABLED += ptytest endif diff --git a/test/stdlib/test-mkostemp-O_CLOEXEC.c b/test/stdlib/test-mkostemp-O_CLOEXEC.c index 5652086..9ff229a 100644 --- a/test/stdlib/test-mkostemp-O_CLOEXEC.c +++ b/test/stdlib/test-mkostemp-O_CLOEXEC.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE_EXTENDED #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -8,6 +9,10 @@ #include <sys/wait.h> #include <errno.h> +#if !defined __ARCH_USE_MMU__ +# define fork vfork +#endif + int main(int argc, char *argv[]) { int fd, status; char buff[5]; diff --git a/test/test-skeleton.c b/test/test-skeleton.c index 6d4a8b6..69ef99f 100644 --- a/test/test-skeleton.c +++ b/test/test-skeleton.c @@ -18,7 +18,6 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <getopt.h> #include <malloc.h> #include <search.h> #include <signal.h> @@ -46,6 +45,7 @@ #define OPT_DIRECT 1000 #define OPT_TESTDIR 1001 +#if 0 /* Not used in uClibc */ static struct option options[] = { #ifdef CMDLINE_OPTIONS @@ -55,6 +55,7 @@ static struct option options[] = { "test-dir", required_argument, NULL, OPT_TESTDIR }, { NULL, 0, NULL, 0 } }; +#endif /* PID of the test itself. */ static pid_t pid; @@ -144,7 +145,9 @@ signal_handler (int sig __attribute__ ((unused))) /* Wait for it to terminate. */ for (i = 0; i < 5; ++i) { +#ifdef __UCLIBC_HAS_REALTIME__ struct timespec ts; +#endif killed = waitpid (pid, &status, WNOHANG|WUNTRACED); if (killed != 0) break; @@ -153,9 +156,14 @@ signal_handler (int sig __attribute__ ((unused))) nanosleep() call return prematurely, all the better. We won't restart it since this probably means the child process finally died. */ +#ifdef __UCLIBC_HAS_REALTIME__ ts.tv_sec = 0; ts.tv_nsec = 100000000; nanosleep (&ts, NULL); +#else + /* No nanosleep, just sleep 1s instead of 0.1s */ + sleep(1); +#endif } if (killed != 0 && killed != pid) { @@ -234,7 +242,14 @@ main (int argc, char *argv[]) setbuf (stdout, NULL); #endif +#if 0 /* Not used in uClibc */ while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1) +#else +# ifndef CMDLINE_OPTIONS +# define CMDLINE_OPTIONS "" +# endif + while ((opt = getopt (argc, argv, "+" CMDLINE_OPTIONS)) >= 0) +#endif switch (opt) { case '?': hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0