svn commit: branches/uClibc-nptl: extra/Configs include libc/sysdeps/linu etc...
sjhill at uclibc.org
sjhill at uclibc.org
Fri Dec 2 02:09:15 UTC 2005
Author: sjhill
Date: 2005-12-01 18:09:10 -0800 (Thu, 01 Dec 2005)
New Revision: 12631
Log:
Changes for NPTL and new build system.
Removed:
branches/uClibc-nptl/libc/sysdeps/linux/common/sysdep.h
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/hp-timing.h
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/pt-raise.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/pt-raise.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_getcpuclockid.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_once.c
Modified:
branches/uClibc-nptl/Makerules
branches/uClibc-nptl/extra/Configs/Config.in
branches/uClibc-nptl/include/link.h
branches/uClibc-nptl/include/stdlib.h
branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile.arch
branches/uClibc-nptl/libpthread/nptl_db/Makefile
Changeset:
Modified: branches/uClibc-nptl/Makerules
===================================================================
--- branches/uClibc-nptl/Makerules 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/Makerules 2005-12-02 02:09:10 UTC (rev 12631)
@@ -78,7 +78,7 @@
disp_ar = $($(DISP)_disp_ar)
disp_ld = $($(DISP)_disp_ld)
-cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(^D))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
+cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(filter-out $(CFLAGS-OMIT-$(notdir $<)), $(CFLAGS-$(notdir $(^D)))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
cmd_compile.S = $(cmd_compile.c) $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $@)) $(CFLAGS-multi-y)
@@ -94,6 +94,7 @@
compile.c = @$(disp_compile.c) ; $(cmd_compile.c)
compile.E = $(cmd_compile.c:-c=-E)
+compile.s = $(cmd_compile.c:-c=-S)
compile.S = @$(disp_compile.S) ; $(cmd_compile.S)
compile.m = @$(disp_compile.m) ; $(cmd_compile.m)
compile-m = @$(disp_compile-m) ; $(cmd_compile-m)
@@ -126,6 +127,8 @@
%.oS: %.s ; $(compile.S)
%.E: %.c ; $(compile.E)
%.E: %.S ; $(compile.E)
+%.s: %.c ; $(compile.s)
+%.s: %.S ; $(compile.s)
$(top_builddir)lib/interp.c:
$(Q)$(INSTALL) -d $(dir $@)
Modified: branches/uClibc-nptl/extra/Configs/Config.in
===================================================================
--- branches/uClibc-nptl/extra/Configs/Config.in 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/extra/Configs/Config.in 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1068,6 +1068,16 @@
bool "Regular Expression Support"
default y
help
+ POSIX regular expression code is really big -- 53k all by itself.
+ If you don't use regular expressions, turn this off and save space.
+ Of course, if you only staticly link, leave this on, since it will
+ only be included in your apps if you use regular expressions.
+
+config UCLIBC_HAS_REGEX_OLD
+ bool "Use the older (stable) Regular Expression Support"
+ depends on UCLIBC_HAS_REGEX
+ default y
+ help
POSIX regular expression code is really big -- 27k all by itself.
If you don't use regular expressions, turn this off and save space.
Of course, if you only staticly link, leave this on, since it will
@@ -1116,7 +1126,7 @@
config SHARED_LIB_LOADER_PREFIX
string "Shared library loader path"
depends on HAVE_SHARED
- default "$(DEVEL_PREFIX)/lib"
+ default "$(RUNTIME_PREFIX)lib"
help
When using shared libraries, this path is the location where the
shared library will be invoked. This value will be compiled into
@@ -1174,7 +1184,7 @@
depends on HAVE_SHARED
depends on TARGET_arm || TARGET_frv || TARGET_i386 || TARGET_mips || TARGET_powerpc
select FORCE_SHAREABLE_TEXT_SEGMENTS
- default y
+ default n
help
If you answer Y here, ldd and iconv are built as ET_DYN/PIE executables.
It requires gcc-3.4 and binutils-2.15 (for arm 2.16) or later.
Modified: branches/uClibc-nptl/include/link.h
===================================================================
--- branches/uClibc-nptl/include/link.h 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/include/link.h 2005-12-02 02:09:10 UTC (rev 12631)
@@ -25,10 +25,7 @@
#include <elf.h>
#include <dlfcn.h>
#include <sys/types.h>
-/* Defines USE_TLS */
-#if defined(IS_IN_libpthread) || defined(IS_IN_rtld)
#include <tls.h>
-#endif
/* We use this macro to refer to ELF types independent of the native wordsize.
`ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */
Modified: branches/uClibc-nptl/include/stdlib.h
===================================================================
--- branches/uClibc-nptl/include/stdlib.h 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/include/stdlib.h 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2003, 2004, 2005 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
@@ -140,11 +140,11 @@
/* Maximum length of a multibyte character in the current locale. */
#if 0
#define MB_CUR_MAX (__ctype_get_mb_cur_max ())
-extern size_t __ctype_get_mb_cur_max (void) __THROW;
+extern size_t __ctype_get_mb_cur_max (void) __THROW __wur;
#endif
#ifdef __UCLIBC_HAS_WCHAR__
#define MB_CUR_MAX (_stdlib_mb_cur_max ())
-extern size_t _stdlib_mb_cur_max (void) __THROW;
+extern size_t _stdlib_mb_cur_max (void) __THROW __wur;
#endif
@@ -152,21 +152,21 @@
#ifdef __UCLIBC_HAS_FLOATS__
/* Convert a string to a floating-point number. */
extern double atof (__const char *__nptr)
- __THROW __attribute_pure__ __nonnull ((1));
+ __THROW __attribute_pure__ __nonnull ((1)) __wur;
#endif /* __UCLIBC_HAS_FLOATS__ */
/* Convert a string to an integer. */
extern int atoi (__const char *__nptr)
- __THROW __attribute_pure__ __nonnull ((1));
+ __THROW __attribute_pure__ __nonnull ((1)) __wur;
/* Convert a string to a long integer. */
extern long int atol (__const char *__nptr)
- __THROW __attribute_pure__ __nonnull ((1));
+ __THROW __attribute_pure__ __nonnull ((1)) __wur;
__END_NAMESPACE_STD
#if defined __USE_ISOC99 || defined __USE_MISC
__BEGIN_NAMESPACE_C99
/* Convert a string to a long long integer. */
__extension__ extern long long int atoll (__const char *__nptr)
- __THROW __attribute_pure__ __nonnull ((1));
+ __THROW __attribute_pure__ __nonnull ((1)) __wur;
__END_NAMESPACE_C99
#endif
@@ -174,18 +174,19 @@
__BEGIN_NAMESPACE_STD
/* Convert a string to a floating-point number. */
extern double strtod (__const char *__restrict __nptr,
- char **__restrict __endptr) __THROW __nonnull ((1));
+ char **__restrict __endptr)
+ __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_STD
#ifdef __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
extern float strtof (__const char *__restrict __nptr,
- char **__restrict __endptr) __THROW __nonnull ((1));
+ char **__restrict __endptr) __THROW __nonnull ((1)) __wur;
extern long double strtold (__const char *__restrict __nptr,
char **__restrict __endptr)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_C99
#endif
#endif /* __UCLIBC_HAS_FLOATS__ */
@@ -194,11 +195,11 @@
/* Convert a string to a long integer. */
extern long int strtol (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
/* Convert a string to an unsigned long integer. */
extern unsigned long int strtoul (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_STD
#ifdef __USE_BSD
@@ -206,12 +207,12 @@
__extension__
extern long long int strtoq (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
/* Convert a string to an unsigned quadword integer. */
__extension__
extern unsigned long long int strtouq (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
#endif /* GCC and use BSD. */
#if defined __USE_ISOC99 || defined __USE_MISC
@@ -220,12 +221,12 @@
__extension__
extern long long int strtoll (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
/* Convert a string to an unsigned quadword integer. */
__extension__
extern unsigned long long int strtoull (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_C99
#endif /* ISO C99 or GCC and use MISC. */
@@ -251,37 +252,38 @@
use as an additional parameter. */
extern long int strtol_l (__const char *__restrict __nptr,
char **__restrict __endptr, int __base,
- __locale_t __loc) __THROW __nonnull ((1, 4));
+ __locale_t __loc) __THROW __nonnull ((1, 4)) __wur;
extern unsigned long int strtoul_l (__const char *__restrict __nptr,
char **__restrict __endptr,
int __base, __locale_t __loc)
- __THROW __nonnull ((1, 4));
+ __THROW __nonnull ((1, 4)) __wur;
__extension__
extern long long int strtoll_l (__const char *__restrict __nptr,
char **__restrict __endptr, int __base,
__locale_t __loc)
- __THROW __nonnull ((1, 4));
+ __THROW __nonnull ((1, 4)) __wur;
__extension__
extern unsigned long long int strtoull_l (__const char *__restrict __nptr,
char **__restrict __endptr,
int __base, __locale_t __loc)
- __THROW __nonnull ((1, 4));
+ __THROW __nonnull ((1, 4)) __wur;
#ifdef __UCLIBC_HAS_FLOATS__
extern double strtod_l (__const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc)
- __THROW __nonnull ((1, 3));
+ __THROW __nonnull ((1, 3)) __wur;
extern float strtof_l (__const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc)
- __THROW __nonnull ((1, 3));
+ __THROW __nonnull ((1, 3)) __wur;
extern long double strtold_l (__const char *__restrict __nptr,
char **__restrict __endptr,
- __locale_t __loc) __THROW __nonnull ((1, 3));
+ __locale_t __loc)
+ __THROW __nonnull ((1, 3)) __wur;
#endif /* __UCLIBC_HAS_FLOATS__ */
/* Internal names to support libstd++. */
@@ -327,11 +329,11 @@
/* Convert N to base 64 using the digits "./0-9A-Za-z", least-significant
digit first. Returns a pointer to static storage overwritten by the
next call. */
-extern char *l64a (long int __n) __THROW;
+extern char *l64a (long int __n) __THROW __wur;
/* Read a number from a string S in base 64 as above. */
extern long int a64l (__const char *__s)
- __THROW __attribute_pure__ __nonnull ((1));
+ __THROW __attribute_pure__ __nonnull ((1)) __wur;
#endif /* Use SVID || extended X/Open. */
@@ -491,10 +493,10 @@
# define __malloc_and_calloc_defined
__BEGIN_NAMESPACE_STD
/* Allocate SIZE bytes of memory. */
-extern void *malloc (size_t __size) __THROW __attribute_malloc__;
+extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur;
/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */
extern void *calloc (size_t __nmemb, size_t __size)
- __THROW __attribute_malloc__;
+ __THROW __attribute_malloc__ __wur;
__END_NAMESPACE_STD
#endif
@@ -502,7 +504,8 @@
__BEGIN_NAMESPACE_STD
/* Re-allocate the previously allocated block
in PTR, making the new block SIZE bytes long. */
-extern void *realloc (void *__ptr, size_t __size) __THROW __attribute_malloc__;
+extern void *realloc (void *__ptr, size_t __size)
+ __THROW __attribute_malloc__ __attribute_warn_unused_result__;
/* Free a block allocated by `malloc', `realloc' or `calloc'. */
extern void free (void *__ptr) __THROW;
__END_NAMESPACE_STD
@@ -518,13 +521,13 @@
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Allocate SIZE bytes on a page boundary. The storage cannot be freed. */
-extern void *valloc (size_t __size) __THROW __attribute_malloc__;
+extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
#endif
#ifdef __USE_XOPEN2K
/* Allocate memory of SIZE bytes with an alignment of ALIGNMENT. */
extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size)
- __THROW;
+ __THROW __nonnull ((1)) __wur;
#endif
__BEGIN_NAMESPACE_STD
@@ -561,12 +564,13 @@
__BEGIN_NAMESPACE_STD
/* Return the value of envariable NAME, or NULL if it doesn't exist. */
-extern char *getenv (__const char *__name) __THROW __nonnull ((1));
+extern char *getenv (__const char *__name) __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_STD
/* This function is similar to the above but returns NULL if the
programs is running with SUID or SGID enabled. */
-extern char *__secure_getenv (__const char *__name) __THROW __nonnull ((1));
+extern char *__secure_getenv (__const char *__name)
+ __THROW __nonnull ((1)) __wur;
#if defined __USE_SVID || defined __USE_XOPEN
/* The SVID says this is in <stdio.h>, but this seems a better place. */
@@ -607,7 +611,7 @@
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the file name unique.
Returns TEMPLATE, or a null pointer if it cannot get a unique file name. */
-extern char *mktemp (char *__template) __THROW __nonnull ((1));
+extern char *mktemp (char *__template) __THROW __nonnull ((1)) __wur;
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
@@ -618,16 +622,17 @@
This function is a possible cancellation points and therefore not
marked with __THROW. */
# ifndef __USE_FILE_OFFSET64
-extern int mkstemp (char *__template) __nonnull ((1));
+extern int mkstemp (char *__template) __nonnull ((1)) __wur;
# else
# ifdef __REDIRECT
-extern int __REDIRECT (mkstemp, (char *__template), mkstemp64) __nonnull ((1));
+extern int __REDIRECT (mkstemp, (char *__template), mkstemp64)
+ __nonnull ((1)) __wur;
# else
# define mkstemp mkstemp64
# endif
# endif
# ifdef __USE_LARGEFILE64
-extern int mkstemp64 (char *__template) __nonnull ((1));
+extern int mkstemp64 (char *__template) __nonnull ((1)) __wur;
# endif
#endif
@@ -637,7 +642,7 @@
they are replaced with a string that makes the directory name unique.
Returns TEMPLATE, or a null pointer if it cannot get a unique name.
The directory is created mode 700. */
-extern char *mkdtemp (char *__template) __THROW __nonnull ((1));
+extern char *mkdtemp (char *__template) __THROW __nonnull ((1)) __wur;
#endif
@@ -646,7 +651,7 @@
This function is a cancellation point and therefore not marked with
__THROW. */
-extern int system (__const char *__command);
+extern int system (__const char *__command) __wur;
__END_NAMESPACE_STD
@@ -655,7 +660,7 @@
named file. The last file name component need not exist, and may be a
symlink to a nonexistent file. */
extern char *canonicalize_file_name (__const char *__name)
- __THROW __nonnull ((1));
+ __THROW __nonnull ((1)) __wur;
#endif
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -666,7 +671,7 @@
ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
name in RESOLVED. */
extern char *realpath (__const char *__restrict __name,
- char *__restrict __resolved) __THROW;
+ char *__restrict __resolved) __THROW __wur;
#endif
@@ -685,7 +690,7 @@
of SIZE bytes each, using COMPAR to perform the comparisons. */
extern void *bsearch (__const void *__key, __const void *__base,
size_t __nmemb, size_t __size, __compar_fn_t __compar)
- __nonnull ((1, 2, 5));
+ __nonnull ((1, 2, 5)) __wur;
/* Sort NMEMB elements of BASE, of SIZE bytes each,
using COMPAR to perform the comparisons. */
@@ -694,13 +699,13 @@
/* Return the absolute value of X. */
-extern int abs (int __x) __THROW __attribute__ ((__const__));
-extern long int labs (long int __x) __THROW __attribute__ ((__const__));
+extern int abs (int __x) __THROW __attribute__ ((__const__)) __wur;
+extern long int labs (long int __x) __THROW __attribute__ ((__const__)) __wur;
__END_NAMESPACE_STD
#ifdef __USE_ISOC99
__extension__ extern long long int llabs (long long int __x)
- __THROW __attribute__ ((__const__));
+ __THROW __attribute__ ((__const__)) __wur;
#endif
@@ -709,16 +714,16 @@
of the value of NUMER over DENOM. */
/* GCC may have built-ins for these someday. */
extern div_t div (int __numer, int __denom)
- __THROW __attribute__ ((__const__));
+ __THROW __attribute__ ((__const__)) __wur;
extern ldiv_t ldiv (long int __numer, long int __denom)
- __THROW __attribute__ ((__const__));
+ __THROW __attribute__ ((__const__)) __wur;
__END_NAMESPACE_STD
#ifdef __USE_ISOC99
__BEGIN_NAMESPACE_C99
__extension__ extern lldiv_t lldiv (long long int __numer,
long long int __denom)
- __THROW __attribute__ ((__const__));
+ __THROW __attribute__ ((__const__)) __wur;
__END_NAMESPACE_C99
#endif
@@ -731,31 +736,31 @@
this. Set *DECPT with the position of the decimal character and *SIGN
with the sign of the number. */
extern char *ecvt (double __value, int __ndigit, int *__restrict __decpt,
- int *__restrict __sign) __THROW __nonnull ((3, 4));
+ int *__restrict __sign) __THROW __nonnull ((3, 4)) __wur;
/* Convert VALUE to a string rounded to NDIGIT decimal digits. Set *DECPT
with the position of the decimal character and *SIGN with the sign of
the number. */
extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt,
- int *__restrict __sign) __THROW __nonnull ((3, 4));
+ int *__restrict __sign) __THROW __nonnull ((3, 4)) __wur;
/* If possible convert VALUE to a string with NDIGIT significant digits.
Otherwise use exponential representation. The resulting string will
be written to BUF. */
extern char *gcvt (double __value, int __ndigit, char *__buf)
- __THROW __nonnull ((3));
+ __THROW __nonnull ((3)) __wur;
# ifdef __USE_MISC
/* Long double versions of above functions. */
extern char *qecvt (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign)
- __THROW __nonnull ((3, 4));
+ __THROW __nonnull ((3, 4)) __wur;
extern char *qfcvt (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign)
- __THROW __nonnull ((3, 4));
+ __THROW __nonnull ((3, 4)) __wur;
extern char *qgcvt (long double __value, int __ndigit, char *__buf)
- __THROW __nonnull ((3));
+ __THROW __nonnull ((3)) __wur;
/* Reentrant version of the functions above which provide their own
@@ -782,14 +787,14 @@
__BEGIN_NAMESPACE_STD
/* Return the length of the multibyte character
in S, which is no longer than N. */
-extern int mblen (__const char *__s, size_t __n) __THROW;
+extern int mblen (__const char *__s, size_t __n) __THROW __wur;
/* Return the length of the given multibyte character,
putting its `wchar_t' representation in *PWC. */
extern int mbtowc (wchar_t *__restrict __pwc,
- __const char *__restrict __s, size_t __n) __THROW;
+ __const char *__restrict __s, size_t __n) __THROW __wur;
/* Put the multibyte character represented
by WCHAR in S, returning its length. */
-extern int wctomb (char *__s, wchar_t __wchar) __THROW;
+extern int wctomb (char *__s, wchar_t __wchar) __THROW __wur;
/* Convert a multibyte string to a wide char string. */
@@ -808,7 +813,7 @@
or negative response expression as specified by the LC_MESSAGES category
in the program's current locale. Returns 1 if affirmative, 0 if
negative, and -1 if not matching. */
-extern int rpmatch (__const char *__response) __THROW __nonnull ((1));
+extern int rpmatch (__const char *__response) __THROW __nonnull ((1)) __wur;
#endif
@@ -822,7 +827,7 @@
extern int getsubopt (char **__restrict __optionp,
char *__const *__restrict __tokens,
char **__restrict __valuep)
- __THROW __nonnull ((1, 2, 3));
+ __THROW __nonnull ((1, 2, 3)) __wur;
#endif
@@ -836,7 +841,7 @@
#ifdef __USE_XOPEN2K
/* Return a master pseudo-terminal handle. */
-extern int posix_openpt (int __oflag);
+extern int posix_openpt (int __oflag) __wur;
#endif
#ifdef __USE_XOPEN
@@ -853,7 +858,7 @@
/* Return the pathname of the pseudo terminal slave assoicated with
the master FD is open on, or NULL on errors.
The returned storage is good until the next call to this function. */
-extern char *ptsname (int __fd) __THROW;
+extern char *ptsname (int __fd) __THROW __wur;
#endif
#ifdef __USE_GNU
Deleted: branches/uClibc-nptl/libc/sysdeps/linux/common/sysdep.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/sysdep.h 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/sysdep.h 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,127 +0,0 @@
-/* Copyright (C) 1991, 1992 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 Library General Public License as
-published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-#include <sys/syscall.h>
-
-/* Not that using a `PASTE' macro loses. */
-#ifdef __STDC__
-
-#ifdef __ELF__
-
-#define SYSCALL_WEAK_ALIAS(alias,orig) \
- .weak alias; \
- alias=__libc_##orig
-
-/*
-#ifdef _POSIX_THREADS
-*/
-
-#if 1
-
-#ifdef PTHREAD_KERNEL
-
-/* Use the regular ELF conventions about underscores, and provide the
- weak symbol, as required */
-#define SYSCALL__(name,args) PSEUDO (__machdep_sys_##name, name, args) \
-.weak machdep_sys_##name; \
- machdep_sys_##name = __machdep_sys_##name; \
-.type __machdep_sys_##name, at function; \
-.type machdep_sys_##name, at function; \
-.L__machdep_sys_##name##end: .size __machdep_sys_##name,.L__machdep_sys_##name##end - __machdep_sys_##name
-
-#define SYSCALL(name,args) PSEUDO (__machdep_sys_##name, name, args) \
-.weak machdep_sys_##name; \
- machdep_sys_##name = __machdep_sys_##name; \
-.type __machdep_sys_##name, at function; \
-.type machdep_sys_##name, at function; \
-.L__machdep_sys_##name##end: .size __machdep_sys_##name,.L__machdep_sys_##name##end - __machdep_sys_##name
-
-#else /* PTHREAD_KERNEL */
-
-/* Use the regular ELF conventions about underscores, and provide the
- weak symbol, as required */
-#define SYSCALL__(name,args) PSEUDO (__libc_##name, name, args) \
-.weak __##name; \
-.weak name; \
- __##name = __libc_##name; \
- name = __libc_##name; \
-.type __libc_##name, at function; \
-.type name, at function; \
-.type __##name, at function; \
-.L__libc_##name##end: .size __libc_##name,.L__libc_##name##end - __libc_##name
-
-#define SYSCALL(name,args) PSEUDO (__libc_##name, name, args) \
-.weak name; \
- name = __libc_##name; \
-.type __libc_##name, at function; \
-.type name, at function; \
-.L__libc_##name##end: .size __libc_##name,.L__libc_##name##end - __libc_##name
-
-#endif /* PTHREAD_KERNEL */
-
-#else /* _POSIX_THREADS */
-
-/* Use the regular ELF conventions about underscores, and provide the
- weak symbol, as required */
-#define SYSCALL__(name,args) PSEUDO (__libc_##name, name, args) \
-.weak name; \
- __##name = __libc_##name; \
- name = __libc_##name; \
-.type __libc_##name, at function; \
-.type name, at function; \
-.type __##name, at function; \
-.L__libc_##name##end: .size __libc_##name,.L__libc_##name##end - __libc_##name
-
-#define SYSCALL(name,args) PSEUDO (__libc_##name, name, args) \
- name = __libc_##name; \
-.type __libc_##name, at function; \
-.type name, at function; \
-.L__libc_##name##end: .size __libc_##name,.L__libc_##name##end - __libc_##name
-
-#endif /* _POSIX_THREADS */
-
-#else /* __ELF__ */
-
-#define SYSCALL_WEAK_ALIAS(alias,orig)
-
-/* Regular a.out definition */
-#define SYSCALL__(name,args) PSEUDO (__##name, name, args)
-#define SYSCALL(name,args) PSEUDO (name, name, args)
-
-#endif /* __ELF__ */
-
-#else /* __STDC__ */
-
-#define SYSCALL__(name,args) PSEUDO (__/**/name, name, args)
-#define SYSCALL(name,args) PSEUDO (name, name, args)
-
-#endif /* __STDC__ */
-
-/* Machine-dependent sysdep.h files are expected to define the macro
- PSEUDO (function_name, syscall_name) to emit assembly code to define the
- C-callable function FUNCTION_NAME to do system call SYSCALL_NAME.
- r0 and r1 are the system call outputs. movl should be defined as
- an instruction such that "movl r1, r0" works. ret should be defined
- as the return instruction. */
-
-
-#if !defined(HAVE_GNU_LD) && !defined (__ELF__)
-#define ___errno _errno
-#endif
-
-#define HAVE_SYSCALLS
Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile 2005-12-02 02:09:10 UTC (rev 12631)
@@ -5,7 +5,9 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-top_srcdir=../../../../
+TOPDIR=../../../../
+
+top_srcdir=$(TOPDIR)
top_builddir=../../../../
all: objs
include $(top_builddir)Rules.mak
Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile.arch
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile.arch 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile.arch 2005-12-02 02:09:10 UTC (rev 12631)
@@ -11,7 +11,7 @@
SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S
-ARCH_HEADERS := sgidefs.h
+ARCH_HEADERS := sgidefs.h sysdep.h
# regdef.h
include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/hp-timing.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/hp-timing.h 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/hp-timing.h 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,83 +0,0 @@
-/* High precision, low overhead timing functions. Generic version.
- Copyright (C) 1998, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at cygnus.com>, 1998.
-
- 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; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _HP_TIMING_H
-#define _HP_TIMING_H 1
-
-
-/* There are no generic definitions for the times. We could write something
- using the `gettimeofday' system call where available but the overhead of
- the system call might be too high.
-
- In case a platform supports timers in the hardware the following macros
- and types must be defined:
-
- - HP_TIMING_AVAIL: test for availability.
-
- - HP_TIMING_INLINE: this macro is non-zero if the functionality is not
- implemented using function calls but instead uses some inlined code
- which might simply consist of a few assembler instructions. We have to
- know this since we might want to use the macros here in places where we
- cannot make function calls.
-
- - hp_timing_t: This is the type for variables used to store the time
- values.
-
- - HP_TIMING_ZERO: clear `hp_timing_t' object.
-
- - HP_TIMING_NOW: place timestamp for current time in variable given as
- parameter.
-
- - HP_TIMING_DIFF_INIT: do whatever is necessary to be able to use the
- HP_TIMING_DIFF macro.
-
- - HP_TIMING_DIFF: compute difference between two times and store it
- in a third. Source and destination might overlap.
-
- - HP_TIMING_ACCUM: add time difference to another variable. This might
- be a bit more complicated to implement for some platforms as the
- operation should be thread-safe and 64bit arithmetic on 32bit platforms
- is not.
-
- - HP_TIMING_ACCUM_NT: this is the variant for situations where we know
- there are no threads involved.
-
- - HP_TIMING_PRINT: write decimal representation of the timing value into
- the given string. This operation need not be inline even though
- HP_TIMING_INLINE is specified.
-
-*/
-
-/* Provide dummy definitions. */
-#define HP_TIMING_AVAIL (0)
-#define HP_TIMING_INLINE (0)
-typedef int hp_timing_t;
-#define HP_TIMING_ZERO(Var)
-#define HP_TIMING_NOW(var)
-#define HP_TIMING_DIFF_INIT()
-#define HP_TIMING_DIFF(Diff, Start, End)
-#define HP_TIMING_ACCUM(Sum, Diff)
-#define HP_TIMING_ACCUM_NT(Sum, Diff)
-#define HP_TIMING_PRINT(Buf, Len, Val)
-
-/* Since this implementation is not available we tell the user about it. */
-#define HP_TIMING_NONAVAIL 1
-
-#endif /* hp-timing.h */
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/pt-raise.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/pt-raise.c 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/pt-raise.c 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,30 +0,0 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at redhat.com>, 2002.
-
- 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; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <pthread.h>
-#include <signal.h>
-
-
-int
-raise (sig)
- int sig;
-{
- /* This is what POSIX says must happen. */
- return pthread_kill (pthread_self (), sig);
-}
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/pt-raise.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/pt-raise.c 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/pt-raise.c 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1 +0,0 @@
-#include <../generic/pt-raise.c>
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_getcpuclockid.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_getcpuclockid.c 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_getcpuclockid.c 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,57 +0,0 @@
-/* Copyright (C) 2000, 2001, 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,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <pthreadP.h>
-#include <sys/time.h>
-#include <tls.h>
-
-
-int
-pthread_getcpuclockid (threadid, clockid)
- pthread_t threadid;
- clockid_t *clockid;
-{
- struct pthread *pd = (struct pthread *) threadid;
-
- /* Make sure the descriptor is valid. */
- if (INVALID_TD_P (pd))
- /* Not a valid thread handle. */
- return ESRCH;
-
-#ifdef CLOCK_THREAD_CPUTIME_ID
- /* We need to store the thread ID in the CLOCKID variable together
- with a number identifying the clock. We reserve the low 3 bits
- for the clock ID and the rest for the thread ID. This is
- problematic if the thread ID is too large. But 29 bits should be
- fine.
-
- If some day more clock IDs are needed the ID part can be
- enlarged. The IDs are entirely internal. */
- if (pd->tid >= 1 << (8 * sizeof (*clockid) - CLOCK_IDFIELD_SIZE))
- return ERANGE;
-
- /* Store the number. */
- *clockid = CLOCK_THREAD_CPUTIME_ID | (pd->tid << CLOCK_IDFIELD_SIZE);
-
- return 0;
-#else
- /* We don't have a timer for that. */
- return ENOENT;
-#endif
-}
Deleted: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_once.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_once.c 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread_once.c 2005-12-02 02:09:10 UTC (rev 12631)
@@ -1,54 +0,0 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper at redhat.com>, 2002.
-
- 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; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include "pthreadP.h"
-#include <lowlevellock.h>
-
-
-
-static lll_lock_t once_lock = LLL_LOCK_INITIALIZER;
-
-
-int
-__pthread_once (once_control, init_routine)
- pthread_once_t *once_control;
- void (*init_routine) (void);
-{
- /* XXX Depending on whether the LOCK_IN_ONCE_T is defined use a
- global lock variable or one which is part of the pthread_once_t
- object. */
- if (*once_control == PTHREAD_ONCE_INIT)
- {
- lll_lock (once_lock);
-
- /* XXX This implementation is not complete. It doesn't take
- cancelation and fork into account. */
- if (*once_control == PTHREAD_ONCE_INIT)
- {
- init_routine ();
-
- *once_control = !PTHREAD_ONCE_INIT;
- }
-
- lll_unlock (once_lock);
- }
-
- return 0;
-}
-strong_alias (__pthread_once, pthread_once)
Modified: branches/uClibc-nptl/libpthread/nptl_db/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/nptl_db/Makefile 2005-12-02 01:54:59 UTC (rev 12630)
+++ branches/uClibc-nptl/libpthread/nptl_db/Makefile 2005-12-02 02:09:10 UTC (rev 12631)
@@ -5,9 +5,7 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-TOPDIR=../../
-
-top_srcdir=$(TOPDIR)
+top_srcdir=../../
top_builddir=../../
include $(top_builddir)Rules.mak
all: libs
More information about the uClibc-cvs
mailing list