From owner-svn-ports-all@freebsd.org Tue Dec 10 17:16:32 2019 Return-Path: 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 A6C061DFDD5; Tue, 10 Dec 2019 17:16:32 +0000 (UTC) (envelope-from sunpoet@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 47XRYX2g2cz41YJ; Tue, 10 Dec 2019 17:16:32 +0000 (UTC) (envelope-from sunpoet@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 53CD12E003; Tue, 10 Dec 2019 17:16:32 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBAHGWk9009130; Tue, 10 Dec 2019 17:16:32 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBAHGWJt009129; Tue, 10 Dec 2019 17:16:32 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201912101716.xBAHGWJt009129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 10 Dec 2019 17:16:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519762 - head/devel/glog/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/devel/glog/files X-SVN-Commit-Revision: 519762 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2019 17:16:32 -0000 Author: sunpoet Date: Tue Dec 10 17:16:31 2019 New Revision: 519762 URL: https://svnweb.freebsd.org/changeset/ports/519762 Log: Fix build on powerpc64 ELFv2 - Teach glog how to use program counter PR: 242343 Submitted by: pkubaj Added: head/devel/glog/files/ head/devel/glog/files/patch-m4-pc_from_ucontext.m4 (contents, props changed) head/devel/glog/files/patch-src-stacktrace_powerpc-inl.h (contents, props changed) Added: head/devel/glog/files/patch-m4-pc_from_ucontext.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/glog/files/patch-m4-pc_from_ucontext.m4 Tue Dec 10 17:16:31 2019 (r519762) @@ -0,0 +1,10 @@ +--- m4/pc_from_ucontext.m4.orig 2019-09-01 20:36:55 UTC ++++ m4/pc_from_ucontext.m4 +@@ -21,6 +21,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], + pc_fields="$pc_fields uc_mcontext.gregs[[R15]]" # Linux (arm old [untested]) + pc_fields="$pc_fields uc_mcontext.arm_pc" # Linux (arm new [untested]) + pc_fields="$pc_fields uc_mcontext.mc_eip" # FreeBSD (i386) ++ pc_fields="$pc_fields uc_mcontext.mc_srr0" # FreeBSD (powerpc, powerpc64) + pc_fields="$pc_fields uc_mcontext.mc_rip" # FreeBSD (x86_64 [untested]) + pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_EIP]]" # NetBSD (i386) + pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_RIP]]" # NetBSD (x86_64) Added: head/devel/glog/files/patch-src-stacktrace_powerpc-inl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/glog/files/patch-src-stacktrace_powerpc-inl.h Tue Dec 10 17:16:31 2019 (r519762) @@ -0,0 +1,11 @@ +--- src/stacktrace_powerpc-inl.h.orig 2019-12-01 18:35:43 UTC ++++ src/stacktrace_powerpc-inl.h +@@ -107,7 +107,7 @@ int GetStackTrace(void** result, int max_depth, int sk + // Link Register is. For DARWIN and AIX (used by apple and + // linux ppc64), it's in sp[2]. For SYSV (used by linux ppc), + // it's in sp[1]. +-#if defined(_CALL_AIX) || defined(_CALL_DARWIN) ++#if defined(_CALL_AIX) || defined(_CALL_DARWIN) || defined(_CALL_ELF) + result[n++] = *(sp+2); + #elif defined(_CALL_SYSV) + result[n++] = *(sp+1);