summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/s390/Makefile
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:58:23 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 15:58:23 +0000
commit25ead03a3712d57df2208fe82f3d316eb8faeaf6 (patch)
treeeb6ebccbeffba879a7cf9cbaa29daeeb73d8e049 /sysdeps/unix/sysv/linux/s390/Makefile
parentbf9f3c5bced2d3a5fb782b5a7de1008d8ca1425c (diff)
parent963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff)
Merge commit 'refs/top-bases/t/faccessat' into t/faccessat
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/Makefile')
-rw-r--r--sysdeps/unix/sysv/linux/s390/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
index 497ffd566c..77f38523b5 100644
--- a/sysdeps/unix/sysv/linux/s390/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/Makefile
@@ -1,11 +1,10 @@
abi-variants := 32 64
-abi-32-options := -U__s390x__
abi-32-condition := __WORDSIZE == 32
-abi-64-options := -D__s390x__
abi-64-condition := __WORDSIZE == 64
ifeq ($(subdir),rt)
librt-routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
endif
ifeq ($(subdir),stdlib)
@@ -17,14 +16,16 @@ sysdep_routines += dl-vdso
endif
ifeq ($(subdir),nptl)
-ifeq ($(enable-lock-elision),yes)
libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
elision-trylock
-elision-CFLAGS = -mhtm
+elision-CFLAGS = -mhtm -msoft-float
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
+
+ifeq ($(subdir),misc)
+tests += tst-ptrace-singleblock
endif