diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4 index 686291402c..a9ce98aeab 100644 --- a/config/opal_config_asm.m4 +++ b/config/opal_config_asm.m4 @@ -1194,11 +1194,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[ OPAL_CHECK_CMPXCHG16B ;; - ia64-*) - opal_cv_asm_arch="IA64" - OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], - [AC_MSG_ERROR([No atomic primitives available for $host])]) - ;; aarch64*) opal_cv_asm_arch="ARM64" OPAL_ASM_SUPPORT_64BIT=1 diff --git a/opal/include/opal/sys/architecture.h b/opal/include/opal/sys/architecture.h index d3cd8d0856..0d56d4ee5e 100644 --- a/opal/include/opal/sys/architecture.h +++ b/opal/include/opal/sys/architecture.h @@ -33,7 +33,6 @@ /* Architectures */ #define OPAL_UNSUPPORTED 0000 #define OPAL_IA32 0010 -#define OPAL_IA64 0020 #define OPAL_X86_64 0030 #define OPAL_POWERPC32 0050 #define OPAL_POWERPC64 0051 diff --git a/opal/include/opal/sys/atomic.h b/opal/include/opal/sys/atomic.h index b52b911421..c744727553 100644 --- a/opal/include/opal/sys/atomic.h +++ b/opal/include/opal/sys/atomic.h @@ -16,6 +16,7 @@ * reserved. * Copyright (c) 2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2020 Google, LLC. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -175,8 +176,6 @@ enum { #include "opal/sys/arm64/atomic.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_IA32 #include "opal/sys/ia32/atomic.h" -#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64 -#include "opal/sys/ia64/atomic.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32 #include "opal/sys/powerpc/atomic.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64 diff --git a/opal/include/opal/sys/cma.h b/opal/include/opal/sys/cma.h index d994537bb2..273b482e4c 100644 --- a/opal/include/opal/sys/cma.h +++ b/opal/include/opal/sys/cma.h @@ -44,9 +44,6 @@ #elif OPAL_ASSEMBLY_ARCH == OPAL_IA32 #define __NR_process_vm_readv 347 #define __NR_process_vm_writev 348 -#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64 -#define __NR_process_vm_readv 1332 -#define __NR_process_vm_writev 1333 #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32 #define __NR_process_vm_readv 351 #define __NR_process_vm_writev 352 diff --git a/opal/include/opal/sys/timer.h b/opal/include/opal/sys/timer.h index 8676b19d2c..7f9a8dd136 100644 --- a/opal/include/opal/sys/timer.h +++ b/opal/include/opal/sys/timer.h @@ -14,6 +14,7 @@ * Copyright (c) 2016-2017 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2020 Intel, Inc. All rights reserved. + * Copyright (c) 2020 Google, LLC. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -79,8 +80,6 @@ BEGIN_C_DECLS #include "opal/sys/arm64/timer.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_IA32 #include "opal/sys/ia32/timer.h" -#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64 -#include "opal/sys/ia64/timer.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32 #include "opal/sys/powerpc/timer.h" #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64