nptl/: no need to regen these headers every make

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

5 files changed, 4 insertions, 10 deletions

diff --git a/libpthread/nptl/.gitignore b/libpthread/nptl/.gitignore
index ca5b60f3e..e20fba840 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 8b6518942..000000000
--- 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 3c0505781..94dcb3653 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 000000000..9982f4287
--- /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 cd5d39314..513d39de4 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;