[git commit nptl] nptl/: no need to regen these headers every make
Austin Foxley
austinf at cetoncorp.com
Tue Sep 22 01:38:24 UTC 2009
commit: http://git.uclibc.org/uClibc/commit/?id=b6f255c6bfb016bbdb59614c11e4395d7845e723
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
libpthread/nptl/.gitignore | 2 --
libpthread/nptl/Banner | 1 -
libpthread/nptl/Makefile.in | 7 +------
libpthread/nptl/banner.h | 1 +
libpthread/nptl/init.c | 3 ++-
5 files changed, 4 insertions(+), 10 deletions(-)
delete mode 100644 libpthread/nptl/Banner
create mode 100644 libpthread/nptl/banner.h
diff --git a/libpthread/nptl/.gitignore b/libpthread/nptl/.gitignore
index ca5b60f..e20fba8 100644
--- a/libpthread/nptl/.gitignore
+++ b/libpthread/nptl/.gitignore
@@ -12,8 +12,6 @@ lowlevelbarrier.[hcs]
lowlevelcond.[hcs]
lowlevelrwlock.[hcs]
unwindbuf.[hcs]
-banner.h
sysdeps/pthread/pt-sigaction.c
sysdeps/pthread/pt-sigfillset.c
sysdeps/pthread/pt-sigprocmask.c
-version.h
diff --git a/libpthread/nptl/Banner b/libpthread/nptl/Banner
deleted file mode 100644
index 8b65189..0000000
--- a/libpthread/nptl/Banner
+++ /dev/null
@@ -1 +0,0 @@
-Native POSIX Threads Library by Ulrich Drepper et al, uClibc port by Steven Hill
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 3c05057..94dcb36 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -310,14 +310,9 @@ include/bits/libc-lock.h: | include/bits
$(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@
include/bits/stdio-lock.h: | include/bits
$(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@
-$(PTDIR)/banner.h:
- $(do_sed) 's/\(.*\)/"\1\\n"/' $(PTDIR)/Banner > $(PTDIR)/banner.h
-$(PTDIR)/version.h:
- @echo "#define VERSION \""$(VERSION)"\"" > $(PTDIR)/version.h
nptl_headers_bootstrap:= include/pthread.h include/semaphore.h include/bits/semaphore.h include/bits/pthreadtypes.h \
- include/bits/libc-lock.h include/bits/stdio-lock.h \
- $(PTDIR)/banner.h $(PTDIR)/version.h
+ include/bits/libc-lock.h include/bits/stdio-lock.h
nptl_headers: $(PTHREAD_OUT)/pthread-errnos.h
diff --git a/libpthread/nptl/banner.h b/libpthread/nptl/banner.h
new file mode 100644
index 0000000..9982f42
--- /dev/null
+++ b/libpthread/nptl/banner.h
@@ -0,0 +1 @@
+"Native POSIX Threads Library by Ulrich Drepper et al, uClibc port by Steven Hill\n"
diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c
index cd5d393..513d39d 100644
--- a/libpthread/nptl/init.c
+++ b/libpthread/nptl/init.c
@@ -29,7 +29,6 @@
#include <ldsodefs.h>
#include <tls.h>
#include <fork.h>
-#include <version.h>
#include <smp.h>
#include <lowlevellock.h>
@@ -59,6 +58,8 @@
size_t __static_tls_size;
size_t __static_tls_align_m1;
+#define VERSION __stringify(__UCLIBC_MAJOR__) "." __stringify(__UCLIBC_MINOR__) "." __stringify(__UCLIBC_SUBLEVEL__)
+
/* Version of the library, used in libthread_db to detect mismatches. */
static const char nptl_version[] __attribute_used__ = VERSION;
--
1.6.3.3
More information about the uClibc-cvs
mailing list