From owner-p4-projects@FreeBSD.ORG Thu Aug 20 14:01:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 739A4106579C; Thu, 20 Aug 2009 14:01:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10269106568C for ; Thu, 20 Aug 2009 14:01:29 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA3848FC78 for ; Thu, 20 Aug 2009 14:01:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7KE1Stx044691 for ; Thu, 20 Aug 2009 14:01:28 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7KE1SMd044689 for perforce@freebsd.org; Thu, 20 Aug 2009 14:01:28 GMT (envelope-from stas@freebsd.org) Date: Thu, 20 Aug 2009 14:01:28 GMT Message-Id: <200908201401.n7KE1SMd044689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 167538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2009 14:01:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=167538 Change 167538 by stas@stas_yandex on 2009/08/20 14:00:57 - Use FreeBSD7 mmap. Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#35 edit .. //depot/projects/valgrind/coregrind/m_ume/elf.c#2 edit .. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#5 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#5 (text+ko) ==== @@ -181,8 +181,8 @@ # elif defined(VGP_amd64_freebsd) if (flags & VKI_MAP_ANONYMOUS && fd == 0) fd = -1; - res = VG_(do_syscall7)(__NR_mmap, (UWord)start, length, - prot, flags, fd, 0, offset); + res = VG_(do_syscall6)(__NR_mmap, (UWord)start, length, + prot, flags, fd, offset); # else # error Unknown platform # endif ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#35 (text+ko) ==== @@ -3298,7 +3298,7 @@ GENX_(__NR_setrlimit, sys_setrlimit), // 195 BSDXY(__NR_getdirentries, sys_getdirentries), // 196 - BSDX_(__NR_mmap, sys_mmap), // 197 + BSDX_(__NR_mmap, sys_mmap7), // 197 // __syscall (handled specially) // 198 BSDX_(__NR_lseek6, sys_lseek), // 199 @@ -3648,7 +3648,7 @@ BSDXY(__NR_pread7, sys_pread7), // 475 BSDX_(__NR_pwrite7, sys_pwrite7), // 476 - BSDX_(__NR_mmap7, sys_mmap7), // 477 + BSDX_(__NR_mmap, sys_mmap7), // 477 BSDX_(__NR_lseek, sys_lseek), // 478 BSDX_(__NR_truncate7, sys_truncate7), // 479 ==== //depot/projects/valgrind/coregrind/m_ume/elf.c#2 (text+ko) ==== ==== //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#5 (text+ko) ==== @@ -174,7 +174,7 @@ #define __NR_getrlimit 194 #define __NR_setrlimit 195 #define __NR_getdirentries 196 -#define __NR_mmap 197 +#define __NR_mmap6 197 #define __NR___syscall 198 #define __NR_lseek6 199 #define __NR_truncate 200 @@ -387,7 +387,7 @@ #define __NR_sctp_generic_recvmsg 474 #define __NR_pread7 475 #define __NR_pwrite7 476 -#define __NR_mmap7 477 +#define __NR_mmap 477 #define __NR_lseek 478 #define __NR_truncate7 479 #define __NR_ftruncate7 480