From nobody Tue May 7 03:50:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516897984862223.19981875886276; Thu, 25 Jan 2018 08:33:04 -0800 (PST) Received: from localhost ([::1]:49329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eekH8-00062w-O3 for importer@patchew.org; Thu, 25 Jan 2018 11:21:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eekFp-0005Rq-2E for qemu-devel@nongnu.org; Thu, 25 Jan 2018 11:19:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eekFn-0001dM-NU for qemu-devel@nongnu.org; Thu, 25 Jan 2018 11:19:57 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46004) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eekFn-0001cF-FO for qemu-devel@nongnu.org; Thu, 25 Jan 2018 11:19:55 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eekFi-0007AV-Vl; Thu, 25 Jan 2018 16:19:51 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 16:19:49 +0000 Message-Id: <1516897189-11035-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH] 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: Paolo Bonzini , Richard Henderson , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- You could in theory have before this commit tried to still use ia64 hosts with the TCI interpreter, but there's no point in supporting ia64 hosts with TCI but not proper TCG. The next bit of cleanup I'd like to do after this is get rid of the "uname -m" fallback in the configure cpu-detection code... configure | 5 ----- include/qemu/processor.h | 3 --- include/qemu/timer.h | 9 --------- accel/tcg/user-exec.c | 33 --------------------------------- linux-user/syscall.c | 7 +------ 5 files changed, 1 insertion(+), 56 deletions(-) diff --git a/configure b/configure index 044c6fa..2f12c77 100755 --- a/configure +++ b/configure @@ -636,8 +636,6 @@ elif check_define _ARCH_PPC ; then fi elif check_define __mips__ ; then cpu=3D"mips" -elif check_define __ia64__ ; then - cpu=3D"ia64" elif check_define __s390__ ; then if check_define __s390x__ ; then cpu=3D"s390x" @@ -4744,9 +4742,6 @@ if test "$coroutine_pool" =3D ""; then fi =20 if test "$debug_stack_usage" =3D "yes"; then - if test "$cpu" =3D "ia64" -o "$cpu" =3D "hppa"; then - error_exit "stack usage debugging is not supported for $cpu" - fi if test "$coroutine_pool" =3D "yes"; then echo "WARN: disabling coroutine pool for stack usage debugging" coroutine_pool=3Dno 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") =20 -#elif defined(__ia64__) -# define cpu_relax() asm volatile("hint @pause" ::: "memory") - #elif defined(__aarch64__) # define cpu_relax() asm volatile("yield" ::: "memory") =20 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; } =20 -#elif defined(__ia64) - -static inline int64_t cpu_get_host_ticks(void) -{ - int64_t val; - asm volatile ("mov %0 =3D ar.itc" : "=3Dr"(val) :: "memory"); - return val; -} - #elif defined(__s390__) =20 static inline int64_t cpu_get_host_ticks(void) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index c973752..eb95cda 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, v= oid *puc) return handle_cpu_signal(pc, info, is_write, &uc->uc_sigmask); } =20 -#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 =3D pinfo; - ucontext_t *uc =3D puc; - unsigned long ip; - int is_write =3D 0; - - ip =3D 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 =3D (info->si_isr >> 33) & 1; - } - break; - - default: - break; - } - return handle_cpu_signal(ip, info, is_write, (sigset_t *)&uc->uc_sigma= sk); -} - #elif defined(__s390__) =20 int cpu_signal_handler(int host_signum, void *pinfo, 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,type= 4 arg4,type5 arg5, \ #define __NR_sys_inotify_add_watch __NR_inotify_add_watch #define __NR_sys_inotify_rm_watch __NR_inotify_rm_watch =20 -#if defined(__alpha__) || defined (__ia64__) || defined(__x86_64__) || \ - defined(__s390x__) +#if defined(__alpha__) || defined(__x86_64__) || defined(__s390x__) #define __NR__llseek __NR_lseek #endif =20 --=20 2.7.4