diff options
36 files changed, 44 insertions, 70 deletions
@@ -1,6 +1,5 @@ # Rules.make for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. @@ -8,16 +7,16 @@ #----------------------------------------------------------- # This file contains rules which are shared between multiple -# Makefiles. All normal configuration options live in the -# file named ".config". Don't mess with this file unless +# Makefiles. All normal configuration options live in the +# file named ".config". Don't mess with this file unless # you know what you are doing. #----------------------------------------------------------- -# If you are running a cross compiler, you will want to set -# 'CROSS' to something more interesting ... Target -# architecture is determined by asking the CC compiler what -# arch it compiles things for, so unless your compiler is +# If you are running a cross compiler, you will want to set +# 'CROSS' to something more interesting ... Target +# architecture is determined by asking the CC compiler what +# arch it compiles things for, so unless your compiler is # broken, you should not need to specify TARGET_ARCH. # # Most people will set this stuff on the command line, i.e. @@ -289,8 +288,8 @@ else export PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),$(PICFLAG)) endif endif -# We need to keep track of both the CC PIE flag (above) as -# well as the LD PIE flag (below) because we can't rely on +# We need to keep track of both the CC PIE flag (above) as +# well as the LD PIE flag (below) because we can't rely on # gcc passing -pie if we used -fPIE ifndef LDPIEFLAG ifneq ($(UCLIBC_BUILD_PIE),y) @@ -452,8 +451,8 @@ PTINC := \ endif CFLAGS+=$(PTINC) else - PTNAME := - PTINC := + PTNAME := + PTINC := endif # Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include' diff --git a/extra/Makefile.in b/extra/Makefile.in index 682168dbc..76f504d88 100644 --- a/extra/Makefile.in +++ b/extra/Makefile.in @@ -1,7 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 245832447..76817ce31 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -1,7 +1,6 @@ # Makefile.in for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # diff --git a/libc/Makefile.in b/libc/Makefile.in index cf1be4a54..6303a864c 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in index 89374f98d..5545d640e 100644 --- a/libc/inet/Makefile.in +++ b/libc/inet/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/inet/rpc/Makefile.in b/libc/inet/rpc/Makefile.in index 0fd12c3e3..af047c0df 100644 --- a/libc/inet/rpc/Makefile.in +++ b/libc/inet/rpc/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/Makefile.in b/libc/misc/Makefile.in index acc71aefe..542859576 100644 --- a/libc/misc/Makefile.in +++ b/libc/misc/Makefile.in @@ -1,7 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # diff --git a/libc/misc/assert/Makefile.in b/libc/misc/assert/Makefile.in index 20f9c2115..3c9111e68 100644 --- a/libc/misc/assert/Makefile.in +++ b/libc/misc/assert/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index b8a07ec84..1fc768ee3 100644 --- a/libc/misc/ctype/Makefile.in +++ b/libc/misc/ctype/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/dirent/Makefile.in b/libc/misc/dirent/Makefile.in index d17ad8a17..89a00ed5e 100644 --- a/libc/misc/dirent/Makefile.in +++ b/libc/misc/dirent/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2001 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in index bc3b2f124..721fe5ec0 100644 --- a/libc/misc/file/Makefile.in +++ b/libc/misc/file/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/fnmatch/Makefile.in b/libc/misc/fnmatch/Makefile.in index 31873d676..c31de9cd6 100644 --- a/libc/misc/fnmatch/Makefile.in +++ b/libc/misc/fnmatch/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in index 2eda3dea2..5fc913265 100644 --- a/libc/misc/glob/Makefile.in +++ b/libc/misc/glob/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/gnu/Makefile.in b/libc/misc/gnu/Makefile.in index bcd9400c3..d64a9eed3 100644 --- a/libc/misc/gnu/Makefile.in +++ b/libc/misc/gnu/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in index ac5482a01..a9638125d 100644 --- a/libc/misc/internals/Makefile.in +++ b/libc/misc/internals/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index 66b9809fa..b51fe0376 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/mntent/Makefile.in b/libc/misc/mntent/Makefile.in index b633e4eb2..958b119b3 100644 --- a/libc/misc/mntent/Makefile.in +++ b/libc/misc/mntent/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/regex/Makefile.in b/libc/misc/regex/Makefile.in index 4e76dee36..e9d70c596 100644 --- a/libc/misc/regex/Makefile.in +++ b/libc/misc/regex/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/search/Makefile.in b/libc/misc/search/Makefile.in index 80fafbf6c..2da1d6e01 100644 --- a/libc/misc/search/Makefile.in +++ b/libc/misc/search/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/syslog/Makefile.in b/libc/misc/syslog/Makefile.in index b1d87e85d..fd9ae198f 100644 --- a/libc/misc/syslog/Makefile.in +++ b/libc/misc/syslog/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in index 44707d643..4c865dc49 100644 --- a/libc/misc/sysvipc/Makefile.in +++ b/libc/misc/sysvipc/Makefile.in @@ -1,12 +1,11 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC := ftok.c +CSRC := ftok.c # multi source sem.c CSRC += semget.c semctl.c semop.c diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index b710b8b7c..b90b9b48f 100644 --- a/libc/misc/time/Makefile.in +++ b/libc/misc/time/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/utmp/Makefile.in b/libc/misc/utmp/Makefile.in index 5e584372c..ff175dc64 100644 --- a/libc/misc/utmp/Makefile.in +++ b/libc/misc/utmp/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index 64171eb96..db01f97cc 100644 --- a/libc/misc/wchar/Makefile.in +++ b/libc/misc/wchar/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. @@ -9,7 +8,7 @@ # The stdio and time related wide functions are now built in the normal # directories. # -# stdio: +# stdio: # fwide fgetwc getwchar fgetws fputwc putwchar fputws ungetwc # getwc (fgetwc alias) getwc_unlocked (fgetwc_unlocked alias) # putwc (fputwc alias) putwc_unlocked (fputwc_unlocked alias) diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in index 0dcd485de..f4210ebb0 100644 --- a/libc/misc/wctype/Makefile.in +++ b/libc/misc/wctype/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/pwd_grp/Makefile.in b/libc/pwd_grp/Makefile.in index 253040e05..c1bbbf1cf 100644 --- a/libc/pwd_grp/Makefile.in +++ b/libc/pwd_grp/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in index 5d4d74ed2..d6134cb06 100644 --- a/libc/stdio/Makefile.in +++ b/libc/stdio/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in index 202e25df2..016b3f1de 100644 --- a/libc/stdlib/Makefile.in +++ b/libc/stdlib/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/stdlib/malloc-standard/Makefile.in b/libc/stdlib/malloc-standard/Makefile.in index 1d29703c4..4a0a86661 100644 --- a/libc/stdlib/malloc-standard/Makefile.in +++ b/libc/stdlib/malloc-standard/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libc/sysdeps/linux/common/create_module.c b/libc/sysdeps/linux/common/create_module.c index 9a5c2d267..f15bb18c5 100644 --- a/libc/sysdeps/linux/common/create_module.c +++ b/libc/sysdeps/linux/common/create_module.c @@ -1,8 +1,10 @@ /* vi: set sw=4 ts=4: */ -/* Syscalls for uClibc +/* + * create_module syscall for uClibc * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ #include <errno.h> @@ -18,8 +20,8 @@ unsigned long create_module(const char *name, size_t size); #if defined(__UCLIBC_BROKEN_CREATE_MODULE__) # define __NR___create_module __NR_create_module static inline _syscall2(long, __create_module, const char *, name, size_t, size); -/* By checking the value of errno, we know if we have been fooled - * by the syscall2 macro making a very high address look like a +/* By checking the value of errno, we know if we have been fooled + * by the syscall2 macro making a very high address look like a * negative, so we we fix it up here. */ unsigned long create_module(const char *name, size_t size) { @@ -40,10 +42,10 @@ static inline _syscall4(unsigned long, __create_module, const char *, name, size_t, size, size_t, dummy, size_t, err); unsigned long create_module(const char *name, size_t size) { - return __create_module(name, size, 0, 0); + return __create_module(name, size, 0, 0); } #else -/* Sparc, MIPS, etc don't mistake return values for errors. */ +/* Sparc, MIPS, etc don't mistake return values for errors. */ _syscall2(unsigned long, create_module, const char *, name, size_t, size); #endif diff --git a/libc/sysdeps/linux/m68k/README.m68k b/libc/sysdeps/linux/m68k/README.m68k index f774e6f7a..a6bb17e4c 100644 --- a/libc/sysdeps/linux/m68k/README.m68k +++ b/libc/sysdeps/linux/m68k/README.m68k @@ -19,7 +19,7 @@ Configuration: CROSS = m68k-pic-coff- CC = $(CROSS)gcc STRIPTOOL = $(CROSS)strip - KERNEL_SOURCE=/opt/uClinux/linux + KERNEL_SOURCE=/opt/uClinux/linux HAS_MMU = false HAS_FLOATS = false MALLOC = malloc-simple @@ -32,7 +32,7 @@ Installation: Theoretically, you should be able to install right over the existing uC-libc 0.9.1 files in /opt/uClinux/m68k-pic-coff/include, but I recommend cleaning - out all the include files there. + out all the include files there. The only file in there that's not from the old uC-libc is assert.h, but I don't know why that would be the valid copy. diff --git a/libc/sysdeps/linux/sh/pipe.c b/libc/sysdeps/linux/sh/pipe.c index e4cc0080d..167db8903 100644 --- a/libc/sysdeps/linux/sh/pipe.c +++ b/libc/sysdeps/linux/sh/pipe.c @@ -1,4 +1,7 @@ +/* vi: set sw=4 ts=4: */ /* + * pipe syscall for uClibc sh + * * Copyright (C) 2001 Lineo, <davidm@lineo.com> * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * @@ -15,15 +18,15 @@ int pipe(int *fd) { long __res, __res2; __asm__ __volatile__ ( - "mov %2, r3;" - "mov %3, r4;" - "trapa #0x13;" - "mov r1, %1;" - : "=z" (__res), - "=r" ((long) __res2) - : "r" ((long) __NR_pipe), - "r" ((long) fd) - : "cc", "memory", "r1", "r3", "r4"); + "mov %2, r3;" + "mov %3, r4;" + "trapa #0x13;" + "mov r1, %1;" + : "=z" (__res), + "=r" ((long) __res2) + : "r" ((long) __NR_pipe), + "r" ((long) fd) + : "cc", "memory", "r1", "r3", "r4"); if ((unsigned long)(__res) >= (unsigned long)(-125)) { int __err = -(__res); errno = __err; diff --git a/libc/termios/Makefile.in b/libc/termios/Makefile.in index f35f78fa2..99b1a729f 100644 --- a/libc/termios/Makefile.in +++ b/libc/termios/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index 0d84b6f10..3ebcd85ed 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/libintl/Makefile.in b/libintl/Makefile.in index 624fa0df8..afaf33080 100644 --- a/libintl/Makefile.in +++ b/libintl/Makefile.in @@ -1,6 +1,5 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. # Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. diff --git a/test/Rules.mak b/test/Rules.mak index 8db8a9163..430f789da 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -1,10 +1,11 @@ # Rules.mak for uClibc test subdirs # -# Copyright (C) 2001 by Lineo, inc. -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # + +# # Note: This does not read the top level Rules.mak file # @@ -16,7 +17,7 @@ TESTDIR=$(top_builddir)test/ UCLIBC_LDSO ?= $(firstword $(wildcard $(top_builddir)lib/ld*)) #-------------------------------------------------------- -# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. +# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C export LC_ALL @@ -103,7 +104,7 @@ SCAT := -@true else ifneq ($(V)$(VERBOSE),) DISP := ver -Q := +Q := SCAT := cat else DISP := pur @@ -117,11 +118,11 @@ pur_showclean = echo " "CLEAN $(notdir $(CURDIR)) pur_showdiff = echo " "TEST_DIFF $(notdir $(CURDIR))/ pur_showlink = echo " "TEST_LINK $(notdir $(CURDIR))/ $@ pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $@ -sil_showclean = +sil_showclean = sil_showdiff = true sil_showlink = true sil_showtest = true -ver_showclean = +ver_showclean = ver_showdiff = true echo ver_showlink = true echo ver_showtest = printf "\n$(banner)\nTEST $(notdir $(PWD))/ $@\n$(banner)\n" |