From fd5beba75e4cd779bbf5ca81c7547e904d4ec9cc Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 30 May 2012 23:44:17 +0000 Subject: [PATCH] Move MIPS ABI settings out of conditional. --- ChangeLog.mips | 3 +++ sysdeps/unix/sysv/linux/mips/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.mips b/ChangeLog.mips index ced2d36..6243cfc 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,5 +1,8 @@ 2012-05-30 Joseph Myers + * sysdeps/unix/sysv/linux/mips/Makefile [subdir = misc]: Move ABI + settings out of conditional. + * sysdeps/unix/sysv/linux/mips/syscalls.list: Remove __connect_internal alias. diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index fd6e3e0..2bbc9a4 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -6,6 +6,7 @@ ifeq ($(subdir),misc) sysdep_routines += cachectl cacheflush sysmips _test_and_set sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h +endif # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3 abi-variants := o32 n32 n64 @@ -16,7 +17,6 @@ abi-n32-options := -D_MIPS_SIM=2 abi-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32 abi-n64-options := -D_MIPS_SIM=3 abi-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64 -endif ifeq ($(subdir),elf) ifeq ($(build-shared),yes) -- 2.7.4