From owner-svn-src-all@FreeBSD.ORG  Wed Aug 13 16:42:45 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4DD879F7;
 Wed, 13 Aug 2014 16:42:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A7092EE4;
 Wed, 13 Aug 2014 16:42:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DGgj8x023263;
 Wed, 13 Aug 2014 16:42:45 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DGgj7G023262;
 Wed, 13 Aug 2014 16:42:45 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201408131642.s7DGgj7G023262@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 13 Aug 2014 16:42:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269948 - head/contrib/gcc/config/i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Aug 2014 16:42:45 -0000

Author: dim
Date: Wed Aug 13 16:42:44 2014
New Revision: 269948
URL: http://svnweb.freebsd.org/changeset/base/269948

Log:
  Supplement r259111 by also using correct casts in gcc's emmintrin.h for
  the first argument of the following builtin function:
  
  * __builtin_ia32_psrlqi128() takes __v2di instead of __v4si
  
  This should fix the following errors when building the graphics/webp
  port with base gcc:
  
  lossless_sse2.c:403: error: incompatible type for argument 1 of '__builtin_ia32_psrlqi128'
  lossless_sse2.c:404: error: incompatible type for argument 1 of '__builtin_ia32_psrlqi128'
  
  Reported by:	Jos Chrispijn <ports@webrz.net>
  MFC after:	3 days

Modified:
  head/contrib/gcc/config/i386/emmintrin.h

Modified: head/contrib/gcc/config/i386/emmintrin.h
==============================================================================
--- head/contrib/gcc/config/i386/emmintrin.h	Wed Aug 13 16:20:41 2014	(r269947)
+++ head/contrib/gcc/config/i386/emmintrin.h	Wed Aug 13 16:42:44 2014	(r269948)
@@ -1193,7 +1193,7 @@ _mm_srli_epi64 (__m128i __A, int __B)
 #define _mm_srli_epi32(__A, __B) \
   ((__m128i)__builtin_ia32_psrldi128 ((__v4si)(__A), __B))
 #define _mm_srli_epi64(__A, __B) \
-  ((__m128i)__builtin_ia32_psrlqi128 ((__v4si)(__A), __B))
+  ((__m128i)__builtin_ia32_psrlqi128 ((__v2di)(__A), __B))
 #endif
 
 static __inline __m128i __attribute__((__always_inline__))