- devel - example.com

[PATCH] ARC: remove deprecated -msoft-float from CFLAGS
by Alexey Brodkin 22 Jun '16

22 Jun '16

"-msoft-float" makes no sense for ARC because there's no such thing as "-mhard-float" on ARC. Instead we use our own "-mfpu=XXX" option when a particular floating-point related HW feature is enabled in the ARC core. We used to live with that phony option for quite some time but with migration to newer GCC following warning now appears: -------------------->8----------------- arc-linux-gcc: warning: ‘-msoft-float’ is deprecated cc1: warning: ‘-msoft-float’ is deprecated [enabled by default] -------------------->8----------------- And that warning gets printed for each invocation of gcc with the option in question, which makes compilation output barely readable. So we disable that phony option for ARC now. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Cc: Vineet Gupta <vgupta(a)synopsys.com> Cc: Anton Kolesov <akolesov(a)synopsys.com> --- Rules.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rules.mak b/Rules.mak index 207c4ec..0517f32 100644 --- a/Rules.mak +++ b/Rules.mak @@ -303,6 +303,7 @@ ifneq ($(TARGET_ARCH),nios2) ifneq ($(TARGET_ARCH),sh) ifneq ($(TARGET_ARCH),c6x) ifneq ($(TARGET_ARCH),h8300) +ifneq ($(TARGET_ARCH),aarch) CPU_CFLAGS-y += -msoft-float endif endif @@ -311,6 +312,7 @@ endif endif endif endif +endif $(eval $(call check-gcc-var,-std=gnu99)) CPU_CFLAGS-y += $(CFLAG_-std=gnu99) -- 2.5.5

1 0

tls tests
by Vlad Zakharov 21 Jun '16

21 Jun '16

Hello, I am debugging uClibc tests for ARC. Many "tls" tests failed. Test "tst-tls1" uses macros from file "tls-macros.h" (e.g. TLS_LE, TLS_IE, etc.), but I couldn't find usage of such macros anywhere except tests. I have some questions: - Are the tests relevant? - What does this test check? -- Best regards, Vlad Zakharov <vzakhar(a)synopsys.com>

2 1

[PATCH] inet/resolv: use h_errno from __dns_lookup instead of a static error code
by Wenzel, Alexander 21 Jun '16

21 Jun '16

When trying to resolve a hostname by getaddrinfo() using some specific settings, it will always return -EAI_NONAME (Name or service not known). To reproduce this behavior, you need to request an IPv6 address with the additional v4mapped flag set from an non IPv6 capable hostname. If you choose a IPv6 capable hostname like google.com, everything works fine. To go a bit deeper, e.g. gethostbyname2_r will always return HOST_NOT_FOUND, which in our example is wrong. The hostname is existent but doesn't provide an IPv6 address. So NO_DATA would be correct, which is present in the h_errno variable set by __dns_lookup. ---- 8< ---- int ret; struct addrinfo* result; struct addrinfo hints; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_INET6; hints.ai_flags = AI_V4MAPPED; ret = getaddrinfo("test.com", NULL, &hints, &result); printf("getaddrinfo(): %i", ret); ---- 8< ---- Signed-off-by: Alexander Wenzel <alexander.wenzel(a)qsc.de> --- libc/inet/resolv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index e3ad513..176fd78 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -2118,7 +2118,7 @@ int gethostbyname_r(const char *name, a.add_count = 0; packet_len = __dns_lookup(name, T_A, &packet, &a); if (packet_len < 0) { - *h_errnop = HOST_NOT_FOUND; + *h_errnop = h_errno; DPRINTF("__dns_lookup returned < 0\n"); return TRY_AGAIN; } @@ -2316,7 +2316,7 @@ int gethostbyname2_r(const char *name, a.add_count = 0; packet_len = __dns_lookup(name, T_AAAA, &packet, &a); if (packet_len < 0) { - *h_errnop = HOST_NOT_FOUND; + *h_errnop = h_errno; DPRINTF("__dns_lookup returned < 0\n"); return TRY_AGAIN; } @@ -2504,7 +2504,7 @@ int gethostbyaddr_r(const void *addr, socklen_t addrlen, /* Hmm why we memset(a) to zeros only once? */ packet_len = __dns_lookup(buf, T_PTR, &packet, &a); if (packet_len < 0) { - *h_errnop = HOST_NOT_FOUND; + *h_errnop = h_errno; return TRY_AGAIN; } -- 2.1.4

1 1

uClibc-ng - small C library for embedded systems branch master updated. v1.0.15-25-g0406327
by wbx＠helium.openadk.org 19 Jun '16

19 Jun '16

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 040632792e9f19ccf49149e4ae3ddac351a98b5a (commit) from 45850d5239bcff4f1352ab7cf4c364cfd46acbcf (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 040632792e9f19ccf49149e4ae3ddac351a98b5a Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Jun 19 17:51:32 2016 +0200 argp: select getopt / getopt_long Select required features. Fix intendation. Reported-by: Leonid Lisovskiy <lly.dev(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: extra/Configs/Config.in | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index a21bdac..4a1509d 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1877,20 +1877,22 @@ config UCLIBC_HAS_GNU_GETSUBOPT Most people will answer Y. config UCLIBC_HAS_ARGP - bool "Support argp (as standalone shared object)" - default n - help - Argp is an interface for parsing unix-style argument vectors. Unlike - the common getopt interface, it provides many advanced features in - addition to parsing options, such as automatic output in response to - `--help' and `--version' options. - A library can export an argp option parser, which programs can easily - use in conjunction with their own option parser. - A new shared object "libuargp" is created. The "libc.so" linker script - contains the AS_NEEDED entry for getting the libuargp linked automatically. - Argp support is needed by elfutils libdw. - - Most people can safely answer N. + bool "Support argp (as standalone shared object)" + select UCLIBC_HAS_GETOPT_LONG + select UCLIBC_HAS_GNU_GETOPT + default n + help + Argp is an interface for parsing unix-style argument vectors. Unlike + the common getopt interface, it provides many advanced features in + addition to parsing options, such as automatic output in response to + `--help' and `--version' options. + A library can export an argp option parser, which programs can easily + use in conjunction with their own option parser. + A new shared object "libuargp" is created. The "libc.so" linker script + contains the AS_NEEDED entry for getting the libuargp linked automatically. + Argp support is needed by elfutils libdw. + + Most people can safely answer N. endmenu hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

uClibc-ng - small C library for embedded systems branch master updated. v1.0.15-24-g45850d5
by wbx＠helium.openadk.org 19 Jun '16

19 Jun '16

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 45850d5239bcff4f1352ab7cf4c364cfd46acbcf (commit) from 953020cb36461d603fc9ff966a2fed63ce18232b (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 45850d5239bcff4f1352ab7cf4c364cfd46acbcf Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sun Jun 19 13:13:49 2016 +0200 or1k: add dummy sys/user.h for strace ----------------------------------------------------------------------- Summary of changes: libc/sysdeps/linux/{arc => or1k}/sys/user.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) copy libc/sysdeps/linux/{arc => or1k}/sys/user.h (84%) diff --git a/libc/sysdeps/linux/arc/sys/user.h b/libc/sysdeps/linux/or1k/sys/user.h similarity index 84% copy from libc/sysdeps/linux/arc/sys/user.h copy to libc/sysdeps/linux/or1k/sys/user.h index e340074..9d23360 100755 --- a/libc/sysdeps/linux/arc/sys/user.h +++ b/libc/sysdeps/linux/or1k/sys/user.h @@ -1,6 +1,4 @@ /* - * Copyright (C) 2013 Synopsys, Inc. (www.synopsys.com) - * * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ @@ -20,4 +18,4 @@ struct user { int dummy; }; -#endif /* sys/user.h */ +#endif /* _SYS_USER_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. v1.0.15-23-g953020c
by wbx＠helium.openadk.org 18 Jun '16

18 Jun '16

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 953020cb36461d603fc9ff966a2fed63ce18232b (commit) from 0d3be3a1d996093aa2ecd41ef8ae7192760aa79c (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 953020cb36461d603fc9ff966a2fed63ce18232b Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Sat Jun 18 23:41:56 2016 +0200 remove unused Makefiles ----------------------------------------------------------------------- Summary of changes: libpthread/nptl/sysdeps/alpha/Makefile | 20 -------------------- libpthread/nptl/sysdeps/i386/Makefile | 26 -------------------------- libpthread/nptl/sysdeps/mips/Makefile | 13 ------------- libpthread/nptl/sysdeps/sh/Makefile | 3 --- libpthread/nptl/sysdeps/sparc/Makefile | 3 --- 5 files changed, 65 deletions(-) delete mode 100644 libpthread/nptl/sysdeps/alpha/Makefile delete mode 100644 libpthread/nptl/sysdeps/i386/Makefile delete mode 100644 libpthread/nptl/sysdeps/mips/Makefile delete mode 100644 libpthread/nptl/sysdeps/sh/Makefile delete mode 100644 libpthread/nptl/sysdeps/sparc/Makefile diff --git a/libpthread/nptl/sysdeps/alpha/Makefile b/libpthread/nptl/sysdeps/alpha/Makefile deleted file mode 100644 index 1cb812e..0000000 --- a/libpthread/nptl/sysdeps/alpha/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2003 Free Software Foundation, Inc. -# This file is part of the GNU C Library. -# -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, see <http://www.gnu.org/licenses/>. - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/libpthread/nptl/sysdeps/i386/Makefile b/libpthread/nptl/sysdeps/i386/Makefile deleted file mode 100644 index c7e1247..0000000 --- a/libpthread/nptl/sysdeps/i386/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# This file is part of the GNU C Library. - -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, see <http://www.gnu.org/licenses/>. - -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif - -ifeq ($(subdir),nptl) -CFLAGS-pthread_create.c += -mpreferred-stack-boundary=4 -CFLAGS-tst-align.c += -mpreferred-stack-boundary=4 -CFLAGS-tst-align2.c += -mpreferred-stack-boundary=4 -endif diff --git a/libpthread/nptl/sysdeps/mips/Makefile b/libpthread/nptl/sysdeps/mips/Makefile deleted file mode 100644 index 6371d28..0000000 --- a/libpthread/nptl/sysdeps/mips/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Makefile for uClibc NPTL -# -# Copyright (C) 2005 Steven J. Hill <sjhill(a)uclibc.org> -# -# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# - -top_srcdir=../../../../ -top_builddir=../../../../ -all: objs -include $(top_builddir)Rules.mak -include Makefile.arch -include $(top_srcdir)Makerules diff --git a/libpthread/nptl/sysdeps/sh/Makefile b/libpthread/nptl/sysdeps/sh/Makefile deleted file mode 100644 index 81bddf6..0000000 --- a/libpthread/nptl/sysdeps/sh/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/libpthread/nptl/sysdeps/sparc/Makefile b/libpthread/nptl/sysdeps/sparc/Makefile deleted file mode 100644 index 81bddf6..0000000 --- a/libpthread/nptl/sysdeps/sparc/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

Re: [uclibc-ng-devel] [PATCH] Fix hardcoded mmap offset
by Waldemar Brodkorb 17 Jun '16

17 Jun '16

Hi Eugeniy, Eugeniy Paltsev wrote, > mmap offset must be a multiple of the page size. It was hardcoded > to 4K, so mmap2 test failed on non-4K page size architectures. > Now we get page size using sysconf(_SC_PAGE_SIZE). > > Build and run tests done on nsim arc hs38. > > Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> > --- > test/mmap/mmap2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, applied and pushed, Waldemar

1 0

[PATCH] sysconf: Support _SC_(AV)?PHYS_PAGES.
by Nicolas Cavallari 17 Jun '16

17 Jun '16

Do it by following the trail of the existing commented code, which implemented it by calling get_phys_pages() and get_avphys_pages(). This patch implements these two functions, which are also glibc extensions. Some program/libraries (e.g. libuv) assumes that sysconf(_SC_PHYS_PAGES) works on linux and never check for -1, thus they report an insane amount of memory. Signed-off-by: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> --- include/sys/sysinfo.h | 2 -- libc/unistd/sysconf.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h index 00e3633..4e756e9 100644 --- a/include/sys/sysinfo.h +++ b/include/sys/sysinfo.h @@ -56,13 +56,11 @@ extern int sysinfo (struct sysinfo *__info) __THROW; #define get_nprocs() (sysconf(_SC_NPROCESSORS_ONLN)) -#if 0 /* Return number of physical pages of memory in the system. */ extern long int get_phys_pages (void) __THROW; /* Return number of available physical pages of memory in the system. */ extern long int get_avphys_pages (void) __THROW; -#endif __END_DECLS diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 503b395..3d3b1a5 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -43,6 +43,32 @@ #include <dirent.h> #include "internal/parse_config.h" +long int get_phys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.totalram / (ps / si.mem_unit); + else + return si.totalram * (si.mem_unit / ps); +} + +long int get_avphys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.freeram / (ps / si.mem_unit); + else + return si.freeram * (si.mem_unit / ps); +} + static int nprocessors_onln(void) { char **l = NULL; @@ -747,18 +773,10 @@ long int sysconf(int name) RETURN_FUNCTION(nprocessors_onln()); case _SC_PHYS_PAGES: -#if 0 RETURN_FUNCTION(get_phys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_AVPHYS_PAGES: -#if 0 RETURN_FUNCTION(get_avphys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_ATEXIT_MAX: return __UCLIBC_MAX_ATEXIT; -- 2.8.1

2 1

[PATCH] test: regex: Make testregex return error count
by Vlad Zakharov 17 Jun '16

17 Jun '16

Testregex returned 0 even when some sub-tests inside the testregex failed. Now it returns error count. Signed-off-by: Vlad Zakharov <vzakhar(a)synopsys.com> --- test/regex/testregex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 993ac26..d18761d 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -2115,7 +2115,7 @@ old_main(int unused_param_argc, char** argv) if (fp != stdin) fclose(fp); } - return 0; + return state.errors; } int main(int argc, char **argv) -- 2.5.5

2 1

uClibc-ng - small C library for embedded systems branch master updated. v1.0.15-22-g0d3be3a
by wbx＠helium.openadk.org 17 Jun '16

17 Jun '16

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 0d3be3a1d996093aa2ecd41ef8ae7192760aa79c (commit) via 199ffd4d10f8ef734032025e0a6847a9e2017bdd (commit) via 5e3d8e668238f1ebbf96843ceb0a699d73a16a38 (commit) via 766da4190705a32fbddd5d0fe61175d76ad31090 (commit) via 14b15ceb1e98ff9a3cacd99bc1a77ce02e8c8684 (commit) from e1eceda87b2fa64ab17f3e32c81b9a97edc7cac7 (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 0d3be3a1d996093aa2ecd41ef8ae7192760aa79c Author: Vlad Zakharov <Vladislav.Zakharov(a)synopsys.com> Date: Thu Jun 16 18:29:09 2016 +0300 test: regex: Make testregex return error count Testregex returned 0 even when some sub-tests inside the testregex failed. Now it returns error count. Signed-off-by: Vlad Zakharov <vzakhar(a)synopsys.com> commit 199ffd4d10f8ef734032025e0a6847a9e2017bdd Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Date: Fri Jun 10 16:00:22 2016 +0300 Fix hardcoded mmap offset mmap offset must be a multiple of the page size. It was hardcoded to 4K, so mmap2 test failed on non-4K page size architectures. Now we get page size using sysconf(_SC_PAGE_SIZE). Build and run tests done on nsim arc hs38. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> commit 5e3d8e668238f1ebbf96843ceb0a699d73a16a38 Author: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> Date: Tue Jun 14 15:12:18 2016 +0200 sysconf: Support _SC_(AV)?PHYS_PAGES. Do it by following the trail of the existing commented code, which implemented it by calling get_phys_pages() and get_avphys_pages(). This patch implements these two functions, which are also glibc extensions. Some program/libraries (e.g. libuv) assumes that sysconf(_SC_PHYS_PAGES) works on linux and never check for -1, thus they report an insane amount of memory. Signed-off-by: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> commit 766da4190705a32fbddd5d0fe61175d76ad31090 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Wed Jun 15 20:42:29 2016 +0200 test: mmap2 is not ARM specific commit 14b15ceb1e98ff9a3cacd99bc1a77ce02e8c8684 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Mon Jun 13 22:32:54 2016 +0200 add MAINTAINERS information ----------------------------------------------------------------------- Summary of changes: MAINTAINERS | 11 +++++++++++ include/sys/sysinfo.h | 2 -- libc/unistd/sysconf.c | 34 ++++++++++++++++++++++++++-------- test/mmap/Makefile.in | 4 ---- test/mmap/{mmap-arm.c => mmap2.c} | 2 +- test/regex/testregex.c | 2 +- 6 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 MAINTAINERS rename test/mmap/{mmap-arm.c => mmap2.c} (97%) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..cecfb24 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,11 @@ +Maintainer: Waldemar Brodkorb <wbx(a)uclibc-ng.org> + +Acrhitecture specific maintainers, Acked-By needed for any architecture +specific changes: + +ARC: +Alexey Brodkin <Alexey.Brodkin(a)synopsys.com> +Vineet Gupta <Vineet.Gupta1(a)synopsys.com> + +Xtensa: +Max Filippov <jcmvbkbc(a)gmail.com> diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h index 00e3633..4e756e9 100644 --- a/include/sys/sysinfo.h +++ b/include/sys/sysinfo.h @@ -56,13 +56,11 @@ extern int sysinfo (struct sysinfo *__info) __THROW; #define get_nprocs() (sysconf(_SC_NPROCESSORS_ONLN)) -#if 0 /* Return number of physical pages of memory in the system. */ extern long int get_phys_pages (void) __THROW; /* Return number of available physical pages of memory in the system. */ extern long int get_avphys_pages (void) __THROW; -#endif __END_DECLS diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 503b395..3d3b1a5 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -43,6 +43,32 @@ #include <dirent.h> #include "internal/parse_config.h" +long int get_phys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.totalram / (ps / si.mem_unit); + else + return si.totalram * (si.mem_unit / ps); +} + +long int get_avphys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.freeram / (ps / si.mem_unit); + else + return si.freeram * (si.mem_unit / ps); +} + static int nprocessors_onln(void) { char **l = NULL; @@ -747,18 +773,10 @@ long int sysconf(int name) RETURN_FUNCTION(nprocessors_onln()); case _SC_PHYS_PAGES: -#if 0 RETURN_FUNCTION(get_phys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_AVPHYS_PAGES: -#if 0 RETURN_FUNCTION(get_avphys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_ATEXIT_MAX: return __UCLIBC_MAX_ATEXIT; diff --git a/test/mmap/Makefile.in b/test/mmap/Makefile.in index 7bb34ac..581f3b0 100644 --- a/test/mmap/Makefile.in +++ b/test/mmap/Makefile.in @@ -1,6 +1,2 @@ # uClibc mmap tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - -ifneq ($(TARGET_ARCH),arm) -TESTS_DISABLED += mmap-arm -endif diff --git a/test/mmap/mmap-arm.c b/test/mmap/mmap2.c similarity index 97% rename from test/mmap/mmap-arm.c rename to test/mmap/mmap2.c index 8b94c61..1d5f5db 100644 --- a/test/mmap/mmap-arm.c +++ b/test/mmap/mmap2.c @@ -18,7 +18,7 @@ #define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) -#define MAP_SIZE 4096UL +#define MAP_SIZE sysconf(_SC_PAGESIZE) #define MAP_MASK (MAP_SIZE - 1) int main(int argc, char **argv) { diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 993ac26..d18761d 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -2115,7 +2115,7 @@ old_main(int unused_param_argc, char** argv) if (fp != stdin) fclose(fp); } - return 0; + return state.errors; } int main(int argc, char **argv) hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0