From a3f10f13847d6cfaa89c8dea21c5e4262b549238 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 7 Jan 2013 21:29:39 +0000 Subject: [PATCH] 2013-01-07 Steve Ellcey * libc/machine/mips/memcpy.S (memcpy): Check if _MIPS_SIM is set. --- newlib/ChangeLog | 4 ++++ newlib/libc/machine/mips/memcpy.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index df6fa0bdf..a0eefe84c 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2013-01-07 Steve Ellcey + + * libc/machine/mips/memcpy.S (memcpy): Check if _MIPS_SIM is set. + 2012-12-20 Jeff Johnston * NEWS: Update with 2.0.0 info. diff --git a/newlib/libc/machine/mips/memcpy.S b/newlib/libc/machine/mips/memcpy.S index fe7cb1581..574f54938 100644 --- a/newlib/libc/machine/mips/memcpy.S +++ b/newlib/libc/machine/mips/memcpy.S @@ -56,7 +56,7 @@ #endif #endif -#if (_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIN32) +#if defined(_MIPS_SIM) && ((_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIN32)) #ifndef DISABLE_DOUBLE #define USE_DOUBLE #endif @@ -203,7 +203,7 @@ #define REG1 t1 #define REG2 t2 #define REG3 t3 -#if _MIPS_SIM == _ABIO32 +#if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIO64) # define REG4 t4 # define REG5 t5 # define REG6 t6