From owner-svn-ports-all@freebsd.org  Sat Nov 21 13:37:33 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A0E252EFBC5;
 Sat, 21 Nov 2020 13:37:33 +0000 (UTC)
 (envelope-from mikael@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CdZGj478Xz4knr;
 Sat, 21 Nov 2020 13:37:33 +0000 (UTC)
 (envelope-from mikael@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 808F11088;
 Sat, 21 Nov 2020 13:37:33 +0000 (UTC)
 (envelope-from mikael@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ALDbXoi073637;
 Sat, 21 Nov 2020 13:37:33 GMT (envelope-from mikael@FreeBSD.org)
Received: (from mikael@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ALDbXaj073635;
 Sat, 21 Nov 2020 13:37:33 GMT (envelope-from mikael@FreeBSD.org)
Message-Id: <202011211337.0ALDbXaj073635@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mikael set sender to
 mikael@FreeBSD.org using -f
From: Mikael Urankar <mikael@FreeBSD.org>
Date: Sat, 21 Nov 2020 13:37:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r555980 - head/security/masscan/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: mikael
X-SVN-Commit-Paths: head/security/masscan/files
X-SVN-Commit-Revision: 555980
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Nov 2020 13:37:33 -0000

Author: mikael
Date: Sat Nov 21 13:37:33 2020
New Revision: 555980
URL: https://svnweb.freebsd.org/changeset/ports/555980

Log:
  security/masscan: fix build on !x86
  
  Only include x86 header on x86
  
  PR:		250899
  Approved by:	taguchi.ch@gmail.com (maintainer timeout)

Modified:
  head/security/masscan/files/patch-src_smack1.c

Modified: head/security/masscan/files/patch-src_smack1.c
==============================================================================
--- head/security/masscan/files/patch-src_smack1.c	Sat Nov 21 13:25:09 2020	(r555979)
+++ head/security/masscan/files/patch-src_smack1.c	Sat Nov 21 13:37:33 2020	(r555980)
@@ -4,7 +4,7 @@
  #include "pixie-timer.h"
  #if defined(_MSC_VER)
  #include <intrin.h>
-+#elif defined(__llvm__)
++#elif defined(__llvm__) && (defined(__amd64__) || defined(__i386__))
 +#include <x86intrin.h>
  #elif defined(__GNUC__)
  static __inline__ unsigned long long __rdtsc(void)