From patchwork Mon Feb 5 19:28:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 126926 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2258979ljc; Mon, 5 Feb 2018 11:41:42 -0800 (PST) X-Google-Smtp-Source: AH8x224CylQZJV+SLP4ewEvR4Rxb5YTf9eD2hDk+I+S4JU4K1/17i7SF9Xv3w2mHyXOdVK0aJql5 X-Received: by 10.37.15.86 with SMTP id 83mr9780317ybp.378.1517859702344; Mon, 05 Feb 2018 11:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517859702; cv=none; d=google.com; s=arc-20160816; b=C02+WgM6aahkEFrko+9MTdEzylug7ditpmv+tv64POucO9rD7loXItAf0sVIUp5gXs zFTXiJc0U+jZgN91KPniaIOphOZqUjc8Ltoo8LZuhVR6A+VsQVWO7Lv+G9gFgxnNB9xM RQp9SdfYasTkjBbfdbApaYQGpUZ1n0sIHGI/0s06+EuKKGl3sP1sed5edPqE2Z2ZVa2w junW2uXrVDXTDANWpJ4bl2hEVoaiZLcLbgYELxe8jkAiPu52230Jmbg9SrHY3uFFu0Di uSJprrtXs6PGBjRXz39Fek5kQXTnSGpzWS+DcdHdg7+9E80+MOyv5wHh67/4nnkpXBw5 +djQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Fhm5PyXzibe7e3ZlTuswG0A6TMZspbCtNDUMI4GnL8g=; b=nhXB3uFLPLATmrvuSwWuNNx7Q58SeXT2S1BDz1GIeBD5FylmJDrzB0untd3DUDjjdc TUZrxiq1IiposnGNXLk+S4VpQjcpIxByT5XnyeKhgzyYEDVN3eJ6gN0uxBptPvDwTvZw EwakLP7W536ZmqWRwc4xPRzWllVvxFcPvUypRSDcJyxD1T8LWAB80iUa+eZFyaO1JyxS EZoGDQUSMshKS0S4zFOGhc/CCeib5zZmel5Lj58EdY1ocwpmaP/g34Q9ceOWWIOTIhV7 Cjdo+5nzzwEm4vBW6D4LyOwQ/PAy9/G0OO23eVnRjrwQwMIAlgTS7HEI2Bdvh9RaH9at nVFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Pm+LPJ1R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 186si1550922ybh.240.2018.02.05.11.41.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Feb 2018 11:41:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Pm+LPJ1R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:54828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eime5-0006vl-NF for patch@linaro.org; Mon, 05 Feb 2018 14:41:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimSE-0004P0-Sj for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimSD-0004yq-ML for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:26 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:39629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimSD-0004yE-D9 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:25 -0500 Received: by mail-wm0-x244.google.com with SMTP id b21so28072446wme.4 for ; Mon, 05 Feb 2018 11:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fhm5PyXzibe7e3ZlTuswG0A6TMZspbCtNDUMI4GnL8g=; b=Pm+LPJ1RI58v6bQHzX9wMLSqOB5V7QbrY1lQngkDvDwxSyd5dEhTd0aQclKK92cRFu u6NnbYMg2P/Cg0jkdJxPMEKWcOmWHmJPlv7GqLgKhDfGbKlt4TwHIUyv1gnh7JrnA9fK T14ik6fwdXulHPDqhCEiq1ivzGDdRPGNfDwaAvb2wW54rtyt8Y9xK2w23LGe8CuI1n9w zDZ4q+TC11Y1Wjoj4EeWpCRWPzgIByF1dZ9Ww/xs4anfGgIILy4fsnOeOQ2cMWo4kB5g MPIRGfVYsBerqH11XFbnsA0FFvU7bbiDHPbCsopVM8OlvIQWt6C/uXrC4wpdKCi0e/AR utRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Fhm5PyXzibe7e3ZlTuswG0A6TMZspbCtNDUMI4GnL8g=; b=Htoxkx4bubVtuWwRJUD5oWGiQqK/zQtPyV26hbJvtJnXOF5C+HUj3bLZTYZqtwOwAY axVnzktqaXz7LTBGAtsYZNC9sCzQY4X0Z0ZBJ8NmzjLMc581FTAxnd4YfMoEo5LX7Gnq ZF3kHWVHKauQR1a6fVpAsB483y9lMAx/M+dATeA/cKUhY7B8yRaTWhWZffNRm2BaGAn+ iF7L0Oi+ao3TXwYfzT+VTD3vhOuHO1o0XaPK6IXgFeuYVTrKvNiOHAu3TUd3vyYZKR/X B9kfWb3IixANPAjU8L+gsweJra0Dma8xjR9sa0XNFqFboWWr4ktpXQYD8DBUw7ekBM2y TIcQ== X-Gm-Message-State: APf1xPBx9X+WwZF2r1OKgJxs+GC4gpjJQ8dLcS/ErFhMIks/sldgvaTN bZvATqZ4hUOAlUhniP19jgA5jfb8 X-Received: by 10.28.214.67 with SMTP id n64mr275122wmg.25.1517858964032; Mon, 05 Feb 2018 11:29:24 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:30 +0100 Message-Id: <1517858941-5538-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 16/47] Drop remaining bits of ia64 host support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell We dropped support for ia64 host CPUs in the 2.11 release (removing the TCG backend for it, and advertising the support as being completely removed in the changelog). However there are a few bits and pieces of code still floating about. Remove those, too. We can drop the check in configure for "ia64 or hppa host?" entirely, because we don't support hppa hosts either any more. Signed-off-by: Peter Maydell Message-Id: <1516897189-11035-1-git-send-email-peter.maydell@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- accel/tcg/user-exec.c | 33 --------------------------------- configure | 5 ----- include/qemu/processor.h | 3 --- include/qemu/timer.h | 9 --------- linux-user/syscall.c | 7 +------ 5 files changed, 1 insertion(+), 56 deletions(-) -- 1.8.3.1 diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index a0a4a19..7789958 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -503,39 +503,6 @@ int cpu_signal_handler(int host_signum, void *pinfo, void *puc) return handle_cpu_signal(pc, info, is_write, &uc->uc_sigmask); } -#elif defined(__ia64) - -#ifndef __ISR_VALID - /* This ought to be in ... */ -# define __ISR_VALID 1 -#endif - -int cpu_signal_handler(int host_signum, void *pinfo, void *puc) -{ - siginfo_t *info = pinfo; - ucontext_t *uc = puc; - unsigned long ip; - int is_write = 0; - - ip = uc->uc_mcontext.sc_ip; - switch (host_signum) { - case SIGILL: - case SIGFPE: - case SIGSEGV: - case SIGBUS: - case SIGTRAP: - if (info->si_code && (info->si_segvflags & __ISR_VALID)) { - /* ISR.W (write-access) is bit 33: */ - is_write = (info->si_isr >> 33) & 1; - } - break; - - default: - break; - } - return handle_cpu_signal(ip, info, is_write, (sigset_t *)&uc->uc_sigmask); -} - #elif defined(__s390__) int cpu_signal_handler(int host_signum, void *pinfo, diff --git a/configure b/configure index 302fdc9..bdbd097 100755 --- a/configure +++ b/configure @@ -636,8 +636,6 @@ elif check_define _ARCH_PPC ; then fi elif check_define __mips__ ; then cpu="mips" -elif check_define __ia64__ ; then - cpu="ia64" elif check_define __s390__ ; then if check_define __s390x__ ; then cpu="s390x" @@ -4744,9 +4742,6 @@ if test "$coroutine_pool" = ""; then fi if test "$debug_stack_usage" = "yes"; then - if test "$cpu" = "ia64" -o "$cpu" = "hppa"; then - error_exit "stack usage debugging is not supported for $cpu" - fi if test "$coroutine_pool" = "yes"; then echo "WARN: disabling coroutine pool for stack usage debugging" coroutine_pool=no diff --git a/include/qemu/processor.h b/include/qemu/processor.h index 8b25702..8e16c92 100644 --- a/include/qemu/processor.h +++ b/include/qemu/processor.h @@ -12,9 +12,6 @@ #if defined(__i386__) || defined(__x86_64__) # define cpu_relax() asm volatile("rep; nop" ::: "memory") -#elif defined(__ia64__) -# define cpu_relax() asm volatile("hint @pause" ::: "memory") - #elif defined(__aarch64__) # define cpu_relax() asm volatile("yield" ::: "memory") diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 1b518bc..3b5a54b 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -931,15 +931,6 @@ static inline int64_t cpu_get_host_ticks(void) return val; } -#elif defined(__ia64) - -static inline int64_t cpu_get_host_ticks(void) -{ - int64_t val; - asm volatile ("mov %0 = ar.itc" : "=r"(val) :: "memory"); - return val; -} - #elif defined(__s390__) static inline int64_t cpu_get_host_ticks(void) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7437894..df1edf0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -36,10 +36,6 @@ #include #include #include -#ifdef __ia64__ -int __clone2(int (*fn)(void *), void *child_stack_base, - size_t stack_size, int flags, void *arg, ...); -#endif #include #include #include @@ -246,8 +242,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ #define __NR_sys_inotify_add_watch __NR_inotify_add_watch #define __NR_sys_inotify_rm_watch __NR_inotify_rm_watch -#if defined(__alpha__) || defined (__ia64__) || defined(__x86_64__) || \ - defined(__s390x__) +#if defined(__alpha__) || defined(__x86_64__) || defined(__s390x__) #define __NR__llseek __NR_lseek #endif