Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Dec 2014 15:46:12 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r375895 - head/audio/opus-tools/files
Message-ID:  <201412311546.sBVFkCGk010801@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Wed Dec 31 15:46:11 2014
New Revision: 375895
URL: https://svnweb.freebsd.org/changeset/ports/375895
QAT: https://qat.redports.org/buildarchive/r375895/

Log:
  On i386, setting CPUTYPE=pentium-m or such will cause __SSE__ to
  appear.  This in turn triggers an #ifdef branch that tries to include
  <cpuid.h>, but gcc on 9.x doesn't have that header.  Make
  query_cpu_support() skip cpuid and always return 0 as it is only
  used for a sanity check that we don't need.
  
  PR:		195881

Added:
  head/audio/opus-tools/files/
  head/audio/opus-tools/files/patch-src_cpusupport.h   (contents, props changed)

Added: head/audio/opus-tools/files/patch-src_cpusupport.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/opus-tools/files/patch-src_cpusupport.h	Wed Dec 31 15:46:11 2014	(r375895)
@@ -0,0 +1,13 @@
+--- src/cpusupport.h.orig	2012-12-17 23:17:07 UTC
++++ src/cpusupport.h
+@@ -33,7 +33,9 @@
+    on a host without those instructions. Therefore we disable
+    the query both if the compiler isn't supporting SSE, and on
+    targets which are guaranteed to have SSE. */
+-# if !defined(__SSE__) || defined(_M_X64) || defined(__amd64__)
++/* XXX  GCC on FreeBSD 9 does not have <cpuid.h>.  On i386, __SSE__ can
++   appear with -march=CPU-TYPE, so disable the SSE check completely. */
++# if !defined(__SSE__) || defined(_M_X64) || defined(__amd64__) || defined(__i386__)
+ #  define query_cpu_support() 0
+ # else
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412311546.sBVFkCGk010801>