summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL46
-rw-r--r--Rules.mak3
-rw-r--r--extra/Configs/Config.in7
-rw-r--r--libc/stdio/_stdio.c1
-rw-r--r--libc/stdio/fflush.c2
-rw-r--r--libc/stdio/popen.c2
-rw-r--r--test/nptl/tst-cancel7.c7
-rw-r--r--test/nptl/tst-mqueue7.c5
-rw-r--r--test/test-skeleton.c10
-rw-r--r--test/unistd/Makefile.in4
10 files changed, 29 insertions, 58 deletions
diff --git a/INSTALL b/INSTALL
index 78fe3fc01..058c0219a 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 218eb1f93..2a73d7f0f 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 f9b3b0a68..2a8c0060a 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 388a2117c..ee247a5fd 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 d9104a42f..cf0356a38 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 40a6ddac1..e1b1d4038 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/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index fe543f73f..3bdfa9fa6 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 01d7cd7d6..d1a652903 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 69ef99f76..cf7afea03 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 '?':
diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
index 44ff36087..6f8a274df 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