diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 10 | ||||
| -rw-r--r-- | include/longlong.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 3c7b3cb1f9..80fc4a8a71 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,13 @@ +2016-01-11 Nick Clifton <nickc@redhat.com> + + Import this change from GCC mainline: + + 2016-01-07 Mike Frysinger <vapier@gentoo.org> + + * longlong.h: Change !__SHMEDIA__ to + (!defined (__SHMEDIA__) || !__SHMEDIA__). + Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__. + 2016-01-06 Maciej W. Rozycki <macro@imgtec.com> * opcode/mips.h: Add a summary of MIPS16 operand codes. diff --git a/include/longlong.h b/include/longlong.h index 4c8d131b9e..5cbc410fb0 100644 --- a/include/longlong.h +++ b/include/longlong.h @@ -1086,7 +1086,7 @@ extern UDItype __umulsidi3 (USItype, USItype); } while (0) #endif -#if defined(__sh__) && !__SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined(__sh__) && (!defined (__SHMEDIA__) || !__SHMEDIA__) && W_TYPE_SIZE == 32 #ifndef __sh1__ #define umul_ppmm(w1, w0, u, v) \ __asm__ ( \ @@ -1159,7 +1159,7 @@ extern UDItype __umulsidi3 (USItype, USItype); #endif /* __sh__ */ -#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined (__SH5__) && defined (__SHMEDIA__) && __SHMEDIA__ && W_TYPE_SIZE == 32 #define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) #define count_leading_zeros(count, x) \ do \ |