From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L0SQv-0004yu-Qc for qemu-devel@nongnu.org; Wed, 12 Nov 2008 21:59:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L0SQu-0004yi-1C for qemu-devel@nongnu.org; Wed, 12 Nov 2008 21:59:48 -0500 Received: from [199.232.76.173] (port=54779 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L0SQt-0004yf-RW for qemu-devel@nongnu.org; Wed, 12 Nov 2008 21:59:47 -0500 Received: from mail.codesourcery.com ([65.74.133.4]:56496) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L0SQt-0007RA-Hu for qemu-devel@nongnu.org; Wed, 12 Nov 2008 21:59:47 -0500 Message-ID: <491B9807.30100@codesourcery.com> Date: Wed, 12 Nov 2008 21:59:19 -0500 From: Sandra Loosemore MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010405080602020203060004" Subject: [Qemu-devel] PATCH: fix undefined function errors Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------010405080602020203060004 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I ran into errors about undefined functions when building user-mode QEMU for ARM Linux after picking up a recent update from trunk. The attached patch fixes the problem. As I'm not a QEMU maintainer, someone who is will have to check this in.... or some alternate fix for the same problem, maybe. -Sandra --------------010405080602020203060004 Content-Type: text/x-log; name="qemu.log" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="qemu.log" 2008-11-12 Sandra Loosemore * linux-user/syscall.c (do_syscall): Make #ifdef on TARGET_NR_inotify_init, TARGET_NR_inotify_add_watch, and TARGET_NR_inotify_rm_watch cases match that used previously in the file, to avoid references to undefined symbols. --------------010405080602020203060004 Content-Type: text/x-patch; name="qemu.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="qemu.patch" Index: linux-user/syscall.c =================================================================== *** linux-user/syscall.c (revision 227507) --- linux-user/syscall.c (working copy) *************** abi_long do_syscall(void *cpu_env, int n *** 6029,6047 **** ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6); break; #endif ! #ifdef TARGET_NR_inotify_init case TARGET_NR_inotify_init: ret = get_errno(sys_inotify_init()); break; #endif ! #ifdef TARGET_NR_inotify_add_watch case TARGET_NR_inotify_add_watch: p = lock_user_string(arg2); ret = get_errno(sys_inotify_add_watch(arg1, path(p), arg3)); unlock_user(p, arg2, 0); break; #endif ! #ifdef TARGET_NR_inotify_rm_watch case TARGET_NR_inotify_rm_watch: ret = get_errno(sys_inotify_rm_watch(arg1, arg2)); break; --- 6029,6047 ---- ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6); break; #endif ! #if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init) case TARGET_NR_inotify_init: ret = get_errno(sys_inotify_init()); break; #endif ! #if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch) case TARGET_NR_inotify_add_watch: p = lock_user_string(arg2); ret = get_errno(sys_inotify_add_watch(arg1, path(p), arg3)); unlock_user(p, arg2, 0); break; #endif ! #if defined(TARGET_NR_inotify_rm_watch) && defined(__NR_inotify_rm_watch) case TARGET_NR_inotify_rm_watch: ret = get_errno(sys_inotify_rm_watch(arg1, arg2)); break; --------------010405080602020203060004--