aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-01-07 22:18:09 +0000
committerMike Frysinger <vapier@gcc.gnu.org>2016-01-07 22:18:09 +0000
commitbd12353b79c3bb253f9acb29eeb426b0ca883fde (patch)
treea71ad8e5ab3d5d43c7fb009f148945a1865708ae /include
parent33b0992375d48a2101c8d3b157e3cef3fbd3f0cf (diff)
downloadgcc-bd12353b79c3bb253f9acb29eeb426b0ca883fde.zip
gcc-bd12353b79c3bb253f9acb29eeb426b0ca883fde.tar.gz
gcc-bd12353b79c3bb253f9acb29eeb426b0ca883fde.tar.bz2
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
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog6
-rw-r--r--include/longlong.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 6d12648..adab9ee 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-07 Mike Frysinger <vapier@gentoo.org>
+
+ * longlong.h: Change !__SHMEDIA__ to
+ (!defined (__SHMEDIA__) || !__SHMEDIA__).
+ Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__.
+
2016-01-05 Mike Frysinger <vapier@gentoo.org>
* libiberty.h (dupargv): Change arg to char * const *.
diff --git a/include/longlong.h b/include/longlong.h
index d7ef671..34ad9b4 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 \