From bd12353b79c3bb253f9acb29eeb426b0ca883fde Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 7 Jan 2016 22:18:09 +0000 Subject: [PATCH] longlong: fix sh -Wundef builds This file fails when building for SuperH as it assumes __SHMEDIA__ is always defined. Update the code to check if it's defined. From-SVN: r232143 --- include/ChangeLog | 6 ++++++ include/longlong.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 6d1264845b5..adab9eebafb 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2016-01-07 Mike Frysinger + + * longlong.h: Change !__SHMEDIA__ to + (!defined (__SHMEDIA__) || !__SHMEDIA__). + Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__. + 2016-01-05 Mike Frysinger * libiberty.h (dupargv): Change arg to char * const *. diff --git a/include/longlong.h b/include/longlong.h index d7ef671226c..34ad9b4f571 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 \