diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
| commit | 14970231a38310b9561052a67b617138eeaad300 (patch) | |
| tree | 35c201a651afa5d5e4fff241280081b3f88b9c2c /sysdeps/unix/sysv/linux/mips/Makefile | |
| parent | f08c7420b5e8b017a1a47b880a62b15bdc588f4d (diff) | |
| parent | 25ead03a3712d57df2208fe82f3d316eb8faeaf6 (diff) | |
Merge commit 'refs/top-bases/t/extern_inline' into t/extern_inline
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips/Makefile')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Makefile | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 8127025503..8217f42e75 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -19,75 +19,39 @@ endif abi-includes := sgidefs.h # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_NABI32 == 2, _MIPS_SIM_ABI64 == 3 -abi-o32_soft-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-o32_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_hard-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-o32_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-o32_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-o32_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=1 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-o32_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI32) -abi-n32_soft-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-n32_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_hard-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-n32_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-n32_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n32_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=2 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-n32_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_NABI32) -abi-n64_soft-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_soft_float -U__mips_hard_float \ - -U__mips_nan2008 abi-n64_soft-condition := !defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_hard-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_hard_float -U__mips_soft_float \ - -U__mips_nan2008 abi-n64_hard-condition := !defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_soft_2008-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_soft_float -U__mips_hard_float \ - -D__mips_nan2008 abi-n64_soft_2008-condition := defined(__mips_nan2008) \ && defined(__mips_soft_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) -abi-n64_hard_2008-options := -U_MIPS_SIM -D_MIPS_SIM=3 \ - -D__mips_hard_float -U__mips_soft_float \ - -D__mips_nan2008 abi-n64_hard_2008-condition := defined(__mips_nan2008) \ && defined(__mips_hard_float) \ && (_MIPS_SIM == _MIPS_SIM_ABI64) @@ -96,7 +60,15 @@ ifeq ($(subdir),elf) ifeq ($(build-shared),yes) # This is needed for DSO loading from static binaries. sysdep-dl-routines += dl-static + +sysdep_routines += dl-vdso endif + +# Supporting non-executable stacks on MIPS requires changes to both +# the Linux kernel and glibc. See +# <https://sourceware.org/ml/libc-alpha/2016-01/msg00567.html> and +# <https://sourceware.org/ml/libc-alpha/2016-01/msg00719.html>. +test-xfail-check-execstack = yes endif ifeq ($(subdir),stdlib) |