aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog54
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/Makefile10
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/Versions5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions7
-rw-r--r--sysdeps/unix/sysv/linux/s390/Makefile13
-rw-r--r--sysdeps/unix/sysv/linux/s390/Versions6
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-conf.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-conf.h (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-lock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-timed.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-trylock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/elision-unlock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/force-elision.h (renamed from nptl/sysdeps/unix/sysv/linux/s390/force-elision.h)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/jmp-unwind.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/lowlevellock.h (renamed from nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pt-longjmp.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/pthread_once.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/Versions8
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c)0
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c (renamed from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c)0
29 files changed, 81 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index b71bf3b..ae25794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
2014-06-26 Roland McGrath <roland@hack.frob.com>
+ * nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
+ folded into ...
+ * sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.
+ * sysdeps/unix/sysv/linux/s390/Versions
+ (libpthread: GLIBC_2.19): New version set.
+ * nptl/sysdeps/unix/sysv/linux/s390/Versions: File removed.
+ * sysdeps/unix/sysv/linux/s390/s390-64/Versions
+ (librt: GLIBC_2.3.3): New version set.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions: File removed.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-conf.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-conf.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-timed.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-trylock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-unlock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/force-elision.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/force-elision.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/lowlevellock.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pt-longjmp.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_once.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: ... here.
+
* nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
(__libc_vfork): Define the function under this name.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Makefile b/nptl/sysdeps/unix/sysv/linux/s390/Makefile
deleted file mode 100644
index 269832f..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(enable-lock-elision),yes)
-libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
- elision-trylock
-
-elision-CFLAGS = -mhtm
-CFLAGS-elision-lock.c = $(elision-CFLAGS)
-CFLAGS-elision-timed.c = $(elision-CFLAGS)
-CFLAGS-elision-trylock.c = $(elision-CFLAGS)
-CFLAGS-elision-unlock.c = $(elision-CFLAGS)
-endif
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Versions b/nptl/sysdeps/unix/sysv/linux/s390/Versions
deleted file mode 100644
index 58632f4..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-libpthread {
- GLIBC_2.19 {
- longjmp; siglongjmp;
- }
-}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
deleted file mode 100644
index 3b111dd..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ /dev/null
@@ -1,7 +0,0 @@
-librt {
- GLIBC_2.3.3 {
- # Changed timer_t.
- timer_create; timer_delete; timer_getoverrun; timer_gettime;
- timer_settime;
- }
-}
diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
index f91179d..768f926 100644
--- a/sysdeps/unix/sysv/linux/s390/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/Makefile
@@ -22,3 +22,16 @@ ifeq (yes,$(build-shared))
sysdep_routines += v1-longjmp_chk
endif
endif
+
+ifeq ($(subdir),nptl)
+ifeq ($(enable-lock-elision),yes)
+libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
+ elision-trylock
+
+elision-CFLAGS = -mhtm
+CFLAGS-elision-lock.c = $(elision-CFLAGS)
+CFLAGS-elision-timed.c = $(elision-CFLAGS)
+CFLAGS-elision-trylock.c = $(elision-CFLAGS)
+CFLAGS-elision-unlock.c = $(elision-CFLAGS)
+endif
+endif
diff --git a/sysdeps/unix/sysv/linux/s390/Versions b/sysdeps/unix/sysv/linux/s390/Versions
index f71a6bd..55518a7 100644
--- a/sysdeps/unix/sysv/linux/s390/Versions
+++ b/sysdeps/unix/sysv/linux/s390/Versions
@@ -8,3 +8,9 @@ libc {
__vdso_clock_getres;
}
}
+
+libpthread {
+ GLIBC_2.19 {
+ longjmp; siglongjmp;
+ }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c b/sysdeps/unix/sysv/linux/s390/elision-conf.c
index 69c0483..69c0483 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c
+++ b/sysdeps/unix/sysv/linux/s390/elision-conf.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h b/sysdeps/unix/sysv/linux/s390/elision-conf.h
index d9e9794..d9e9794 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h
+++ b/sysdeps/unix/sysv/linux/s390/elision-conf.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c b/sysdeps/unix/sysv/linux/s390/elision-lock.c
index ba5338f..ba5338f 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c
+++ b/sysdeps/unix/sysv/linux/s390/elision-lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c b/sysdeps/unix/sysv/linux/s390/elision-timed.c
index a8d8b2a..a8d8b2a 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c
+++ b/sysdeps/unix/sysv/linux/s390/elision-timed.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c b/sysdeps/unix/sysv/linux/s390/elision-trylock.c
index 61447d6..61447d6 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c
+++ b/sysdeps/unix/sysv/linux/s390/elision-trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c b/sysdeps/unix/sysv/linux/s390/elision-unlock.c
index 9ceae3e..9ceae3e 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c
+++ b/sysdeps/unix/sysv/linux/s390/elision-unlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/force-elision.h b/sysdeps/unix/sysv/linux/s390/force-elision.h
index 8fd7684..8fd7684 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/force-elision.h
+++ b/sysdeps/unix/sysv/linux/s390/force-elision.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
index f35eab5..f35eab5 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
+++ b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
index cabff30..cabff30 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
index 801432c..801432c 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
+++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
index 6fc0f96..6fc0f96 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
+++ b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
index 6fd6a98..6fd6a98 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
+++ b/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
index d0e6537..d0e6537 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
+++ b/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
index ea8a8ff..ea8a8ff 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
+++ b/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c b/sysdeps/unix/sysv/linux/s390/pthread_once.c
index ce02206..ce02206 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c
+++ b/sysdeps/unix/sysv/linux/s390/pthread_once.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index 0eeefca..0eeefca 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
index 83092db..3f4d960 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
@@ -5,3 +5,11 @@ libc {
__frame_state_for; __register_frame_info_table;
}
}
+
+librt {
+ GLIBC_2.3.3 {
+ # Changed timer_t.
+ timer_create; timer_delete; timer_getoverrun; timer_gettime;
+ timer_settime;
+ }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index b3560c8..b3560c8 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
index d307135..d307135 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
index 2dd94f5..2dd94f5 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
index 22eaff5..22eaff5 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
index cea524b..cea524b 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
index fa23114..fa23114 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
generated by cgit v1.1 at 2024-11-09 11:55:36 +0000