This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [PATCH] longlong: fix sh -Wundef builds

From: Mike Frysinger <vapier at gentoo dot org>
To: Oleg Endo <oleg dot endo at t-online dot de>
Cc: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>, "aoliva at redhat dot com" <aoliva at redhat dot com>, "kkojima at gcc dot gnu dot org" <kkojima at gcc dot gnu dot org>, "olegendo at gcc dot gnu dot org" <olegendo at gcc dot gnu dot org>
Date: Thu, 7 Jan 2016 17:18:11 -0500
Subject: Re: [PATCH] longlong: fix sh -Wundef builds
Authentication-results: sourceware.org; auth=none
References: <1452195588-9455-1-git-send-email-vapier at gentoo dot org> <F8EF1117-AD3A-4EC0-96BF-8E2FE8ECD2E4 at t-online dot de>

On 08 Jan 2016 06:54, Oleg Endo wrote:
> On Jan 8, 2016, at 4:39 AM, Mike Frysinger <vapier@gentoo.org> wrote:
> > This file fails when building for SuperH as it assumes __SHMEDIA__ is
> > always defined.  Update the code to check if it's defined.
> 
> This is OK for trunk.  Thanks for spotting it.

i had checked only the first case previously (as i don't have sh5
systems), but there's a logic error in the second i fixed before
committing.  this is what i merged:
--- include/longlong.h	(revision 232142)
+++ include/longlong.h	(working copy)
@@ -1086,7 +1086,7 @@ extern UDItype __umulsidi3 (USItype, USI
   } 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, USI
 
 #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									\
-mike

Attachment: signature.asc
Description: Digital signature

Follow-Ups:
- Re: [PATCH] longlong: fix sh -Wundef builds
  - From: Oleg Endo

References:
- [PATCH] longlong: fix sh -Wundef builds
  - From: Mike Frysinger
- Re: [PATCH] longlong: fix sh -Wundef builds
  - From: Oleg Endo

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]