From owner-svn-ports-branches@freebsd.org Tue Feb 2 18:29:09 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27A90A99936; Tue, 2 Feb 2016 18:29:09 +0000 (UTC) (envelope-from rakuco@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 mx1.freebsd.org (Postfix) with ESMTPS id 0360A1075; Tue, 2 Feb 2016 18:29:08 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u12IT8pX005351; Tue, 2 Feb 2016 18:29:08 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u12IT8Xb005350; Tue, 2 Feb 2016 18:29:08 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201602021829.u12IT8Xb005350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 2 Feb 2016 18:29:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407833 - branches/2016Q1/sysutils/reptyr/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2016 18:29:09 -0000 Author: rakuco Date: Tue Feb 2 18:29:07 2016 New Revision: 407833 URL: https://svnweb.freebsd.org/changeset/ports/407833 Log: MFH: r407832 Fix build on 9.3-amd64 after r407349. 9.3-i386, which is what I was using for testing the build on FreeBSD 9, worked fine, but 9.3-amd64 was broken with -Werror. Add a patch I sent upstream to stop trying to cast NULL into an int, which was making GCC 4.2.1 complain: platform/freebsd/arch/x86_common.h: In function 'arch_get_register': platform/freebsd/arch/x86_common.h:48: warning: cast from pointer to integer of different size platform/freebsd/arch/x86_common.h: In function 'arch_set_register': platform/freebsd/arch/x86_common.h:57: warning: cast from pointer to integer of different size platform/freebsd/arch/x86_common.h:59: warning: cast from pointer to integer of different size platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_to_child': platform/freebsd/freebsd_ptrace.c:267: warning: cast from pointer to integer of different size platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_from_child': platform/freebsd/freebsd_ptrace.c:282: warning: cast from pointer to integer of different size PR: 206539 Approved by: portmgr blanket approval Added: branches/2016Q1/sysutils/reptyr/files/patch-git_308f600 - copied unchanged from r407832, head/sysutils/reptyr/files/patch-git_308f600 Modified: Directory Properties: branches/2016Q1/ (props changed) Copied: branches/2016Q1/sysutils/reptyr/files/patch-git_308f600 (from r407832, head/sysutils/reptyr/files/patch-git_308f600) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/sysutils/reptyr/files/patch-git_308f600 Tue Feb 2 18:29:07 2016 (r407833, copy of r407832, head/sysutils/reptyr/files/patch-git_308f600) @@ -0,0 +1,36 @@ +commit 308f60064fee6d5707514b65f6acad656a8a4feb +Author: Raphael Kubo da Costa +Date: Tue Feb 2 19:04:11 2016 +0100 + + FreeBSD: Do not try to cast NULL to int. + + Passing NULL to the data parameter in calls to ptrace(2) causes failures + on 64-bit FreeBSD 9 installations, where GCC 4.2.1 complains like this: + + platform/freebsd/arch/x86_common.h: In function 'arch_get_register': + platform/freebsd/arch/x86_common.h:48: warning: cast from pointer to integer of different size + platform/freebsd/arch/x86_common.h: In function 'arch_set_register': + platform/freebsd/arch/x86_common.h:57: warning: cast from pointer to integer of different size + platform/freebsd/arch/x86_common.h:59: warning: cast from pointer to integer of different size + platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_to_child': + platform/freebsd/freebsd_ptrace.c:267: warning: cast from pointer to integer of different size + platform/freebsd/freebsd_ptrace.c: In function 'ptrace_memcpy_from_child': + platform/freebsd/freebsd_ptrace.c:282: warning: cast from pointer to integer of different size + + Make ptrace_command pass 0 to _ptrace_command so that the final + expansion looks like this: + __ptrace_command((cld), (req), (void*)(addr), (int)(0)) + instead of + __ptrace_command((cld), (req), (void*)(addr), (int)(((void*)0))) + +--- platform/freebsd/freebsd_ptrace.c ++++ platform/freebsd/freebsd_ptrace.c +@@ -47,7 +47,7 @@ + static int __ptrace_command(struct ptrace_child *child, int req, + void *, int); + +-#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, NULL, NULL) ++#define ptrace_command(cld, req, ...) _ptrace_command(cld, req, ## __VA_ARGS__, 0, 0) + #define _ptrace_command(cld, req, addr, data, ...) __ptrace_command((cld), (req), (void*)(addr), (int)(data)) + +