From patchwork Fri Nov 18 14:27:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 126419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B358BB7260 for ; Sat, 19 Nov 2011 01:27:34 +1100 (EST) Received: (qmail 22696 invoked by alias); 18 Nov 2011 14:27:31 -0000 Received: (qmail 22669 invoked by uid 22791); 18 Nov 2011 14:27:30 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from c2beaomr10.btconnect.com (HELO mail.btconnect.com) (213.123.26.188) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Nov 2011 14:27:16 +0000 Received: from host81-138-1-83.in-addr.btopenworld.com (EHLO thor.office) ([81.138.1.83]) by c2beaomr10.btconnect.com with ESMTP id FDS20752; Fri, 18 Nov 2011 14:27:13 +0000 (GMT) Message-Id: From: Iain Sandoe To: GCC Patches Mime-Version: 1.0 (Apple Message framework v936) Subject: [Patch libitm/testsuite] MAP_ANON Date: Fri, 18 Nov 2011 14:27:12 +0000 Cc: Richard Henderson , Mike Stump X-Mirapoint-IP-Reputation: reputation=Fair-1, source=Queried, refid=tid=0001.0A0B0303.4EC66B41.003F, actions=tag X-Junkmail-Premium-Raw: score=8/50, refid=2.7.2:2011.11.18.130316:17:8.129, ip=81.138.1.83, rules=__HAS_MSGID, __SANE_MSGID, __MSGID_APPLEMAIL, __TO_MALFORMED_2, __CT, __CTYPE_HAS_BOUNDARY, __CTYPE_MULTIPART, CTYPE_MULTIPART_NO_QUOTE, __CTYPE_MULTIPART_MIXED, __MIME_VERSION, __MIME_VERSION_APPLEMAIL, __MULTIPLE_RCPTS_CC_X2, __HAS_X_MAILER, __X_MAILER_APPLEMAIL, TXT_ATTACHED, BODY_SIZE_1700_1799, BODYTEXTP_SIZE_3000_LESS, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, __USER_AGENT_APPLEMAIL, RDNS_SUSP, BODY_SIZE_2000_LESS, BODY_SIZE_7000_LESS, NO_URI_FOUND, MIME_TEXT_ONLY_MP_MIXED, MULTIPLE_RCPTS X-Junkmail-Signature-Raw: score=unknown, refid=str=0001.0A0B020D.4EC66B42.00FF, ss=1, fgs=0, ip=0.0.0.0, so=2010-07-22 22:03:31, dmn=2009-09-10 00:05:08, mode=multiengine X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org For some reason, Darwin spells "MAP_ANONYMOUS" and "MAP_ANON" which causes the memcpy/set tests to fail. fixed as below OK for trunk? Iain libitm: * testsuite/libitm.c/memcpy-1.c: Allow for MAP_ANON spelling. * testsuite/libitm.c/memset-1.c: Likewise. Index: libitm/testsuite/libitm.c/memcpy-1.c =================================================================== --- libitm/testsuite/libitm.c/memcpy-1.c (revision 181470) +++ libitm/testsuite/libitm.c/memcpy-1.c (working copy) @@ -84,6 +84,12 @@ do_test (size_t align1, size_t align2, size_t len) } } +#ifndef MAP_ANONYMOUS +# ifdef MAP_ANON +# define MAP_ANONYMOUS MAP_ANON +# endif +#endif + int main() { size_t i, j; Index: libitm/testsuite/libitm.c/memset-1.c =================================================================== --- libitm/testsuite/libitm.c/memset-1.c (revision 181470) +++ libitm/testsuite/libitm.c/memset-1.c (working copy) @@ -33,6 +33,12 @@ static unsigned char *buf; static size_t bufsize, page_size; static int fail; +#ifndef MAP_ANONYMOUS +# ifdef MAP_ANON +# define MAP_ANONYMOUS MAP_ANON +# endif +#endif + static void do_test (size_t align, size_t len) {