[git commit nptl] nptl_db: Reinstate version.h for nptl

Carmelo Amoroso carmelo.amoroso at st.com
Sat Sep 26 16:37:45 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=391c4414b3b3768bf98dde0959a64e435751dfe7
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

This time do not create the header file at each build

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 libpthread/nptl/init.c         |    3 +--
 libpthread/nptl/version.h      |    1 +
 libpthread/nptl_db/td_ta_new.c |    4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)
 create mode 100644 libpthread/nptl/version.h

diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c
index 513d39d..0c55bbb 100644
--- a/libpthread/nptl/init.c
+++ b/libpthread/nptl/init.c
@@ -31,6 +31,7 @@
 #include <fork.h>
 #include <smp.h>
 #include <lowlevellock.h>
+#include <version.h>
 
 
 #ifndef __NR_set_tid_address
@@ -58,8 +59,6 @@
 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;
 
diff --git a/libpthread/nptl/version.h b/libpthread/nptl/version.h
new file mode 100644
index 0000000..f294f5c
--- /dev/null
+++ b/libpthread/nptl/version.h
@@ -0,0 +1 @@
+#define VERSION __stringify(__UCLIBC_MAJOR__) "." __stringify(__UCLIBC_MINOR__) "." __stringify(__UCLIBC_SUBLEVEL__)
diff --git a/libpthread/nptl_db/td_ta_new.c b/libpthread/nptl_db/td_ta_new.c
index bc8caee..f84049a 100644
--- a/libpthread/nptl_db/td_ta_new.c
+++ b/libpthread/nptl_db/td_ta_new.c
@@ -21,11 +21,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-//#ifdef __UCLIBC__
-//#include <../nptl/version.h>
-//#else
 #include <version.h>
-//#endif
 
 #include "thread_dbP.h"
 
-- 
1.6.3.3



More information about the uClibc-cvs mailing list