diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | Rules.mak | 5 | ||||
| -rw-r--r-- | extra/Configs/Config.in | 15 | ||||
| -rw-r--r-- | include/ssp-internal.h | 83 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/Makefile | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/lockfile.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/mutex.c | 6 |
8 files changed, 24 insertions, 98 deletions
diff --git a/Makefile.in b/Makefile.in index f9279a600..f8c082bbe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -111,8 +111,8 @@ install_headers: fi ; \ tar -chf - --exclude .svn $$extra_exclude include \ | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) - $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ssp-internal.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h + $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h ifneq ($(UCLIBC_HAS_FLOATS),y) # Remove floating point related headers since float support is disabled. $(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h @@ -298,7 +298,7 @@ defconfig: extra/config/conf clean: @$(RM) -r lib include/bits $(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a - $(RM) include/fpu_control.h include/dl-osinfo.h + $(RM) include/fpu_control.h include/dl-osinfo.h include/hp-timing.h $(MAKE) -C extra/locale locale_clean $(MAKE) headers_clean-y $(MAKE) -C test clean @@ -141,7 +141,6 @@ $(top_builddir)lib/interp.c: $(interp): $(top_builddir)lib/interp.c $(compile.c) - @$(disp_strip) $(Q)$(STRIPTOOL) -x -R .note -R .comment $@ $(ldso): @@ -168,13 +167,11 @@ endif $(top_builddir)lib/$(CRT).o: $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(CRT).S $(Q)$(INSTALL) -d $(dir $@) $(compile.S) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@)) - @$(disp_strip) $(Q)$(STRIPTOOL) -x -R .note -R .comment $@ $(top_builddir)lib/S$(CRT).o: $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(CRT).S $(Q)$(INSTALL) -d $(dir $@) $(compile.S) $(PIEFLAG) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@)) - @$(disp_strip) $(Q)$(STRIPTOOL) -x -R .note -R .comment $@ CTOR_TARGETS=$(top_builddir)lib/crti.o $(top_builddir)lib/crtn.o @@ -379,9 +379,12 @@ gcc_tls_test_fail: endif else PTINC := \ + -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ + -I$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(PTDIR)/sysdeps/pthread \ - -I$(PTDIR) + -I$(PTDIR) \ + -I$(top_builddir)libpthread endif CFLAGS+=$(PTINC) else diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 0bb55bce0..16d1c07c2 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1074,14 +1074,19 @@ config UCLIBC_HAS_REGEX only be included in your apps if you use regular expressions. config UCLIBC_HAS_REGEX_OLD - bool "Use the older (stable) Regular Expression Support" + bool "Use the older (stable) regular expression code" 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 - only be included in your apps if you use regular expressions. + There are two versions of regex. The older (stable) version has + been in uClibc for quite a long time but hasn't seen too many + updates. It also has some known issues when dealing with uncommon + corner cases and multibyte/unicode strings. However, it is quite + a bit smaller than the newer version. + + If the older version has worked for you and you don't need unicode + support, then stick with the old version (and say Y here). + Otherwise, you should use the new version (and say N here). config UCLIBC_HAS_WORDEXP bool "Support the wordexp() interface" diff --git a/include/ssp-internal.h b/include/ssp-internal.h deleted file mode 100644 index cd44b4f5d..000000000 --- a/include/ssp-internal.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Distributed under the terms of the GNU Lesser General Public License - * $Header: $ - */ - -#ifndef _SSP_INTERNAL_H -#define _SSP_INTERNAL_H 1 - -#ifdef __SSP__ -#error "file must not be compiled with stack protection enabled on it. Use -fno-stack-protector" -#endif - -#ifdef __PROPOLICE_BLOCK_SEGV__ -# define SSP_SIGTYPE SIGSEGV -#else -# define SSP_SIGTYPE SIGABRT -#endif - -#include <sys/types.h> -#include <sys/time.h> -#include <signal.h> -#include <linux/unistd.h> - -#ifndef errno -extern int errno; -#endif - -#ifndef __SSP_QUICK_CANARY__ -#define __NR___kernel_open __NR_open -static __always_inline _syscall3(int,__kernel_open,const char *,path,int,flags,__kernel_mode_t,mode); -#define OPEN(path, flags, mode) __kernel_open(path, flags, mode) - -/* void * = __ptr_t */ -#define __NR___kernel_read __NR_read -static __always_inline _syscall3(ssize_t,__kernel_read,int,fd,void *,buf,size_t,count); -#define READ(fd, buf, count) __kernel_read(fd, buf, count) - -#define __NR___kernel_close __NR_close -static __always_inline _syscall1(int,__kernel_close,int,fd); -#define CLOSE(fd) __kernel_close(fd) -#endif - -/* const void * = const __ptr_t */ -#define __NR___kernel_write __NR_write -static __always_inline _syscall3(ssize_t,__kernel_write,int,fd,const void *,buf,size_t,count); -#define WRITE(fd, buf, count) __kernel_write(fd, buf, count) - -/* not using __NR_ */ -#define __NR___kernel_gettimeofday __NR_gettimeofday -static __always_inline _syscall2(int,__kernel_gettimeofday,struct timeval *,tv,struct timezone *,tz); -#define GETTIMEOFDAY(tv, tz) __kernel_gettimeofday(tv, tz) - -#define __NR___kernel_getpid __NR_getpid -static __always_inline _syscall0(pid_t,__kernel_getpid); -#define GETPID() __kernel_getpid() - -//#ifdef __NR_rt_sigaction -//#define __NR___kernel_sigaction __NR_rt_sigaction -//static __always_inline _syscall4(...); -//#else -#define __NR___kernel_sigaction __NR_sigaction -static __always_inline _syscall3(int,__kernel_sigaction,int,signum,const struct sigaction *,act,struct sigaction *,oldact); -//#endif -#define SIGACTION(signum, act, oldact) __kernel_sigaction(signum, act, oldact) - -//#ifdef __NR_rt_sigprocmask -//#define __NR___kernel_sigprocmask __NR_rt_sigprocmask -//static __always_inline _syscall4(...); -//#else -#define __NR___kernel_sigprocmask __NR_sigprocmask -static __always_inline _syscall3(int,__kernel_sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset); -//#endif -#define SIGPROCMASK(how, set, oldset) __kernel_sigprocmask(how, set, oldset) - -#define __NR___kernel_kill __NR_kill -static __always_inline _syscall2(int,__kernel_kill,__kernel_pid_t,pid,int,sig); -#define KILL(pid, sig) __kernel_kill(pid, sig) - -#define __NR___kernel_exit __NR_exit -static __always_inline _syscall1(void,__kernel_exit,int,status); -#define EXIT(status) __kernel_exit(status) - -#endif /* _SSP_INTERNAL_H */ diff --git a/libpthread/linuxthreads.old/Makefile b/libpthread/linuxthreads.old/Makefile index f92f205a5..f9100219a 100644 --- a/libpthread/linuxthreads.old/Makefile +++ b/libpthread/linuxthreads.old/Makefile @@ -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 diff --git a/libpthread/linuxthreads.old/lockfile.c b/libpthread/linuxthreads.old/lockfile.c index b0f41c98a..7bd2155ac 100644 --- a/libpthread/linuxthreads.old/lockfile.c +++ b/libpthread/linuxthreads.old/lockfile.c @@ -33,7 +33,7 @@ __fresetlockfiles (void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) - pthread_mutex_init(&fp->__lock, &attr); + __pthread_mutex_init(&fp->__lock, &attr); pthread_mutexattr_destroy(&attr); } diff --git a/libpthread/linuxthreads.old/mutex.c b/libpthread/linuxthreads.old/mutex.c index 7cc344fac..d66882d4e 100644 --- a/libpthread/linuxthreads.old/mutex.c +++ b/libpthread/linuxthreads.old/mutex.c @@ -35,6 +35,7 @@ int __pthread_mutex_init(pthread_mutex_t * mutex, return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) +hidden_def (__pthread_mutex_init) int __pthread_mutex_destroy(pthread_mutex_t * mutex) { @@ -54,6 +55,7 @@ int __pthread_mutex_destroy(pthread_mutex_t * mutex) } } strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy) +hidden_def (__pthread_mutex_destroy) int __pthread_mutex_trylock(pthread_mutex_t * mutex) { @@ -90,6 +92,7 @@ int __pthread_mutex_trylock(pthread_mutex_t * mutex) } } strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock) +hidden_def (__pthread_mutex_trylock) int __pthread_mutex_lock(pthread_mutex_t * mutex) { @@ -123,6 +126,7 @@ int __pthread_mutex_lock(pthread_mutex_t * mutex) } } strong_alias (__pthread_mutex_lock, pthread_mutex_lock) +hidden_def (__pthread_mutex_lock) int __pthread_mutex_timedlock (pthread_mutex_t *mutex, const struct timespec *abstime) @@ -167,6 +171,7 @@ int __pthread_mutex_timedlock (pthread_mutex_t *mutex, } } strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock) +hidden_def (__pthread_mutex_timedlock) int __pthread_mutex_unlock(pthread_mutex_t * mutex) { @@ -198,6 +203,7 @@ int __pthread_mutex_unlock(pthread_mutex_t * mutex) } } strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock) +hidden_def (__pthread_mutex_unlock) int __pthread_mutexattr_init(pthread_mutexattr_t *attr) { |