From 083d802892e033570afe95b46895c619d5e8356a Mon Sep 17 00:00:00 2001 From: nickc Date: Thu, 25 Oct 2001 13:20:59 +0000 Subject: [PATCH] Replace occurrences of #elif with #if...#endif. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46489 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/mips/isa3264.h | 26 ++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c05ec90b9a..44d633a1a03 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-10-25 Nick Clifton + + * config/mips/isa3264.h (SUBTARGET_CPP_SIZE_SPEC): Replace + occurrences of #elif with #if...#endif. + 2001-10-25 Kaveh R. Ghazi * cris.h (EH_RETURN_DATA_REGNO): Fix unsigned>=0 warning. diff --git a/gcc/config/mips/isa3264.h b/gcc/config/mips/isa3264.h index cd25e55ae79..61686445072 100644 --- a/gcc/config/mips/isa3264.h +++ b/gcc/config/mips/isa3264.h @@ -41,7 +41,7 @@ Boston, MA 02111-1307, USA. */ ABI_{EABI,O64,O32,...} are #defined. */ #if MIPS_ABI_DEFAULT == ABI_EABI -#undef SUBTARGET_CPP_SIZE_SPEC +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=eabi|!mabi=*:\ %{mips1|mips2|mips32|mlong32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ @@ -51,8 +51,10 @@ Boston, MA 02111-1307, USA. */ %{!mlong64:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int}} \ %{mabi=32:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ " -#elif MIPS_ABI_DEFAULT == ABI_O64 -#undef SUBTARGET_CPP_SIZE_SPEC +#endif + +#if MIPS_ABI_DEFAULT == ABI_O64 +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=eabi:\ %{mips1|mips2|mips32|mlong32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ @@ -62,10 +64,11 @@ Boston, MA 02111-1307, USA. */ %{!mlong64:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int}} \ %{mabi=32:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ " +#endif -#elif MIPS_ABI_DEFAULT == ABI_32 +#if MIPS_ABI_DEFAULT == ABI_32 #if MIPS_ISA_DEFAULT == 3 || MIPS_ISA_DEFAULT == 4 || MIPS_ISA_DEFAULT == 5 || MIPS_ISA_DEFAULT == 64 -#undef SUBTARGET_CPP_SIZE_SPEC +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=eabi:\ %{mips1|mips2|mips32|mlong32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ @@ -76,7 +79,7 @@ Boston, MA 02111-1307, USA. */ %{mabi=32:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ " #else /* not a 64bit default ISA */ -#undef SUBTARGET_CPP_SIZE_SPEC +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=eabi:\ %{mips3|mips4|mips5|mips64|mlong64:-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int} \ @@ -93,8 +96,9 @@ Boston, MA 02111-1307, USA. */ -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int}}}}} \ " #endif /* ISA */ +#endif -#elif MIPS_ABI_DEFAULT == ABI_MEABI +#if MIPS_ABI_DEFAULT == ABI_MEABI /* For MEABI, don't link with crt0 files, let the linker start files specify the appropriate crt0 file. */ #undef STARTFILE_SPEC @@ -109,7 +113,7 @@ Boston, MA 02111-1307, USA. */ handle overriding mlong32 with mlong64 and vise-versa, the specs cannot. */ #if MIPS_ISA_DEFAULT == 3 || MIPS_ISA_DEFAULT == 4 || MIPS_ISA_DEFAULT == 5 || MIPS_ISA_DEFAULT == 64 -#undef SUBTARGET_CPP_SIZE_SPEC +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=meabi:\ %{mips1|mips2|mips32|mlong32: -D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int} \ @@ -126,7 +130,7 @@ Boston, MA 02111-1307, USA. */ " #else /* not a 64bit default ISA */ -#undef SUBTARGET_CPP_SIZE_SPEC +#undef SUBTARGET_CPP_SIZE_SPEC #define SUBTARGET_CPP_SIZE_SPEC "\ %{mabi=meabi:\ %{mips3|mips4|mips5|mips64|mlong64:-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long\\ int} \ @@ -142,7 +146,5 @@ Boston, MA 02111-1307, USA. */ %{!mlong64:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int }} \ " #endif /* ISA */ +#endif -#endif /* ABI */ - -/* eof */ -- 2.11.4.GIT