diff options
-rw-r--r-- | libpthread/nptl/init.c | 3 | ||||
-rw-r--r-- | libpthread/nptl/version.h | 1 | ||||
-rw-r--r-- | libpthread/nptl_db/td_ta_new.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c index 513d39de4..0c55bbb8f 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 000000000..f294f5c97 --- /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 bc8caee20..f84049af3 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" |