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 7ea5fc8e6f92dcc01bcd883cf4bcfbb8993d89fe (commit) from 61edcb7982b4f355d14cc9c349ab2742b682b3f1 (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 7ea5fc8e6f92dcc01bcd883cf4bcfbb8993d89fe Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Sun Feb 15 00:54:21 2015 -0600 some linuxthreads conversion fixups Maybe my grep is broken, so that I missed it. ;) ----------------------------------------------------------------------- Summary of changes: libpthread/linuxthreads/Makefile.in | 22 ++++++++++---------- libpthread/linuxthreads/forward.c | 2 +- libpthread/linuxthreads/internals.h | 2 +- libpthread/linuxthreads/libc_pthread_init.c | 2 +- .../linuxthreads/sysdeps/pthread/bits/libc-lock.h | 2 +- .../linuxthreads/sysdeps/pthread/bits/libc-tsd.h | 2 +- .../sysdeps/pthread/pthread-functions.h | 2 +- libpthread/linuxthreads/sysdeps/sh64/Makefile.arch | 4 ++-- libpthread/linuxthreads_db/Makefile.in | 16 +++++++------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 6be2099..886108b 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -6,10 +6,10 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -subdirs += libpthread/linuxthreads.old +subdirs += libpthread/linuxthreads -CFLAGS-dir_linuxthreads.old := -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-libpthread/linuxthreads.old := $(CFLAGS-dir_linuxthreads.old) $(SSP_ALL_CFLAGS) +CFLAGS-dir_linuxthreads := -DNOT_IN_libc -DIS_IN_libpthread +CFLAGS-libpthread/linuxthreads := $(CFLAGS-dir_linuxthreads) $(SSP_ALL_CFLAGS) ifeq ($(PTHREADS_DEBUG_SUPPORT),y) LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs @@ -25,8 +25,8 @@ END_FILE-libpthread.so := $(SHARED_END_FILES) libpthread_FULL_NAME := libpthread-$(VERSION).so -libpthread_DIR := $(top_srcdir)libpthread/linuxthreads.old -libpthread_OUT := $(top_builddir)libpthread/linuxthreads.old +libpthread_DIR := $(top_srcdir)libpthread/linuxthreads +libpthread_OUT := $(top_builddir)libpthread/linuxthreads -include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch @@ -50,8 +50,8 @@ libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpt # # Stuff that goes into libc.so, not libpthread.so # -CFLAGS-OMIT-forward.c := $(CFLAGS-dir_linuxthreads.old) -CFLAGS-OMIT-libc_pthread_init.c := $(CFLAGS-dir_linuxthreads.old) +CFLAGS-OMIT-forward.c := $(CFLAGS-dir_linuxthreads) +CFLAGS-OMIT-libc_pthread_init.c := $(CFLAGS-dir_linuxthreads) libpthread_libc_CSRC := forward.c libc_pthread_init.c libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC)) libc-static-y += $(libpthread_OUT)/libc_pthread_init.o @@ -110,10 +110,10 @@ linuxthreads_headers := $(top_builddir)include/pthread.h \ $(linuxthreads_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers) -objclean-y += CLEAN_libpthread/linuxthreads.old -headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old -HEADERCLEAN_libpthread/linuxthreads.old: +objclean-y += CLEAN_libpthread/linuxthreads +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads +HEADERCLEAN_libpthread/linuxthreads: $(do_rm) $(linuxthreads_headers) -CLEAN_libpthread/linuxthreads.old: +CLEAN_libpthread/linuxthreads: $(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a) diff --git a/libpthread/linuxthreads/forward.c b/libpthread/linuxthreads/forward.c index 5a1771b..08295c8 100644 --- a/libpthread/linuxthreads/forward.c +++ b/libpthread/linuxthreads/forward.c @@ -24,7 +24,7 @@ #if 0 vda: here is why: headers contain libc_hidden_proto(foo). -In libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h +In libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h adding libc_hidden_proto(foo) just before weak_extern (__pthread_initialize) will not warn: /* libc_hidden_proto(foo) */ diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h index ea274d8..1b310b5 100644 --- a/libpthread/linuxthreads/internals.h +++ b/libpthread/linuxthreads/internals.h @@ -29,7 +29,7 @@ #include <sys/wait.h> #include "pt-machine.h" #include "semaphore.h" -#include "../linuxthreads.old_db/thread_dbP.h" +#include "../linuxthreads_db/thread_dbP.h" #ifdef __UCLIBC_HAS_XLOCALE__ #include <bits/uClibc_locale.h> #endif /* __UCLIBC_HAS_XLOCALE__ */ diff --git a/libpthread/linuxthreads/libc_pthread_init.c b/libpthread/linuxthreads/libc_pthread_init.c index dfdcbcc..b64da05 100644 --- a/libpthread/linuxthreads/libc_pthread_init.c +++ b/libpthread/linuxthreads/libc_pthread_init.c @@ -18,7 +18,7 @@ #include <locale.h> #include <string.h> -#include <linuxthreads.old/sysdeps/pthread/pthread-functions.h> +#include <linuxthreads/sysdeps/pthread/pthread-functions.h> int __libc_multiple_threads attribute_hidden __attribute__((nocommon)); diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h index 8833e34..a7c0249 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -23,7 +23,7 @@ #include <pthread.h> #if defined _LIBC && !defined NOT_IN_libc -#include <linuxthreads.old/internals.h> +#include <linuxthreads/internals.h> #endif /* Mutex type. */ diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h b/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h index 97af75e..66b4892 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h +++ b/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h @@ -30,7 +30,7 @@ enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0, _LIBC_TSD_KEY_N }; #include <features.h> -#include <linuxthreads.old/internals.h> +#include <linuxthreads/internals.h> #ifdef __UCLIBC_HAS_TLS__ #include <tls.h> diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h index 2afaa52..119953d 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h +++ b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h @@ -22,7 +22,7 @@ #include <pthread.h> #if 0 #include <setjmp.h> -#include <linuxthreads.old/internals.h> +#include <linuxthreads/internals.h> struct fork_block; #endif diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch index ddb5664..3fbb53b 100644 --- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch +++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch @@ -6,8 +6,8 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads.old/sysdeps/sh64 -libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads.old/sysdeps/sh64 +libpthread_ARCH_DIR:=$(top_srcdir)libpthread/linuxthreads/sysdeps/sh64 +libpthread_ARCH_OUT:=$(top_builddir)libpthread/linuxthreads/sysdeps/sh64 libpthread_ARCH_SRC:=$(wildcard $(libpthread_ARCH_DIR)/*.c) libpthread_ARCH_OBJ:=$(patsubst $(libpthread_ARCH_DIR)/%.c,$(libpthread_ARCH_OUT)/%.o,$(libpthread_ARCH_SRC)) diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index cf0ceb3..52cc7c8 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -5,10 +5,10 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -subdirs += libpthread/linuxthreads.old_db +subdirs += libpthread/linuxthreads_db # Get the thread include dependencies and shared object name -CFLAGS-libpthread/linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" +CFLAGS-libpthread/linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) ifeq ($(DOSTRIP),y) @@ -19,8 +19,8 @@ LIBS-libthread_db.so := $(LIBS) libthread_db_FULL_NAME := libthread_db-$(VERSION).so -libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads.old_db -libthread_db_OUT := $(top_builddir)libpthread/linuxthreads.old_db +libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads_db +libthread_db_OUT := $(top_builddir)libpthread/linuxthreads_db libthread_db_SRC := $(wildcard $(libthread_db_DIR)/*.c) @@ -68,11 +68,11 @@ linuxthreads_db_headers := $(top_builddir)include/thread_db.h $(linuxthreads_db_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(PTHREADS_DEBUG_SUPPORT) += $(linuxthreads_db_headers) -objclean-y += CLEAN_libpthread/linuxthreads.old_db -headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old_db +objclean-y += CLEAN_libpthread/linuxthreads_db +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads_db -HEADERCLEAN_libpthread/linuxthreads.old_db: +HEADERCLEAN_libpthread/linuxthreads_db: $(do_rm) $(linuxthreads_db_headers) -CLEAN_libpthread/linuxthreads.old_db: +CLEAN_libpthread/linuxthreads_db: $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a) hooks/post-receive -- uClibc-ng - small C library for embedded systems