From owner-svn-ports-head@freebsd.org Wed Aug 28 17:15:46 2019 Return-Path: Delivered-To: svn-ports-head@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 7C57BE2049; Wed, 28 Aug 2019 17:15:46 +0000 (UTC) (envelope-from pkubaj@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) server-signature RSA-PSS (4096 bits) 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 46JXSf2PgMz4SM6; Wed, 28 Aug 2019 17:15:46 +0000 (UTC) (envelope-from pkubaj@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 15F2FA96C; Wed, 28 Aug 2019 17:15:46 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7SHFjn8056845; Wed, 28 Aug 2019 17:15:45 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7SHFjXq056843; Wed, 28 Aug 2019 17:15:45 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201908281715.x7SHFjXq056843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 28 Aug 2019 17:15:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510083 - in head/devel/abseil: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/devel/abseil: . files X-SVN-Commit-Revision: 510083 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2019 17:15:46 -0000 Author: pkubaj Date: Wed Aug 28 17:15:45 2019 New Revision: 510083 URL: https://svnweb.freebsd.org/changeset/ports/510083 Log: devel/abseil: fix build on powerpc* Implement logic for querying TBR and TBR frequency to fix build. PR: 239423 Approved by: danfe (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D21430 Added: head/devel/abseil/files/ head/devel/abseil/files/patch-absl_base_internal_unscaledcycleclock.cc (contents, props changed) Modified: head/devel/abseil/Makefile Modified: head/devel/abseil/Makefile ============================================================================== --- head/devel/abseil/Makefile Wed Aug 28 17:07:37 2019 (r510082) +++ head/devel/abseil/Makefile Wed Aug 28 17:15:45 2019 (r510083) @@ -11,8 +11,6 @@ COMMENT= Abseil Common Libraries (C++) LICENSE= APACHE20 -BROKEN_powerpc= fatal error: sys/platform/ppc.h: No such file or directory - USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_PROJECT= ${PORTNAME}-cpp Added: head/devel/abseil/files/patch-absl_base_internal_unscaledcycleclock.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/abseil/files/patch-absl_base_internal_unscaledcycleclock.cc Wed Aug 28 17:15:45 2019 (r510083) @@ -0,0 +1,54 @@ +--- absl/base/internal/unscaledcycleclock.cc.orig 2019-07-24 12:47:23 UTC ++++ absl/base/internal/unscaledcycleclock.cc +@@ -20,10 +20,15 @@ + #include + #endif + +-#if defined(__powerpc__) || defined(__ppc__) ++#if (defined(__powerpc__) || defined(__ppc__)) && !defined(__FreeBSD__) + #include + #endif + ++#ifdef __FreeBSD__ ++#include ++#include ++#endif ++ + #include "absl/base/internal/sysinfo.h" + + namespace absl { +@@ -56,11 +61,34 @@ double UnscaledCycleClock::Frequency() { + #elif defined(__powerpc__) || defined(__ppc__) + + int64_t UnscaledCycleClock::Now() { ++#ifndef __FreeBSD__ + return __ppc_get_timebase(); ++#else ++ union { long long complete; unsigned int part[2]; } ticks; ++ unsigned int tmp; ++ asm volatile( ++ "0:\n" ++ "mftbu %[hi32]\n" ++ "mftb %[lo32]\n" ++ "mftbu %[tmp]\n" ++ "cmpw %[tmp],%[hi32]\n" ++ "bne 0b\n" ++ : [hi32] "=r"(ticks.part[0]), [lo32] "=r"(ticks.part[1]), ++ [tmp] "=r"(tmp) ++ ); ++ return ticks.complete; ++#endif + } + + double UnscaledCycleClock::Frequency() { ++#ifndef __FreeBSD__ + return __ppc_get_timebase_freq(); ++#else ++ long timebaseFrequency = 0; ++ size_t length = sizeof(timebaseFrequency); ++ sysctlbyname("kern.timecounter.tc.timebase.frequency", &timebaseFrequency, &length, NULL, 0); ++ return timebaseFrequency; ++#endif + } + + #elif defined(__aarch64__)