Skip to content

Commit 65a0961

Browse files
committed
opal: remove remaining atomic references to IA64
IA64 atomic support was deleted some time ago. Some of the references to the architecture were not removed when the atomic support was. This commit removes those lingering references. IA64 will continue to work unsupported with the built-in atomics. Signed-off-by: Nathan Hjelm <[email protected]>
1 parent b1fff49 commit 65a0961

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

config/opal_config_asm.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,11 +1194,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
11941194
OPAL_CHECK_CMPXCHG16B
11951195
;;
11961196
1197-
ia64-*)
1198-
opal_cv_asm_arch="IA64"
1199-
OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"],
1200-
[AC_MSG_ERROR([No atomic primitives available for $host])])
1201-
;;
12021197
aarch64*)
12031198
opal_cv_asm_arch="ARM64"
12041199
OPAL_ASM_SUPPORT_64BIT=1

opal/include/opal/sys/architecture.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
/* Architectures */
3434
#define OPAL_UNSUPPORTED 0000
3535
#define OPAL_IA32 0010
36-
#define OPAL_IA64 0020
3736
#define OPAL_X86_64 0030
3837
#define OPAL_POWERPC32 0050
3938
#define OPAL_POWERPC64 0051

opal/include/opal/sys/atomic.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* reserved.
1717
* Copyright (c) 2017 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1920
* $COPYRIGHT$
2021
*
2122
* Additional copyrights may follow
@@ -175,8 +176,6 @@ enum {
175176
#include "opal/sys/arm64/atomic.h"
176177
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
177178
#include "opal/sys/ia32/atomic.h"
178-
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
179-
#include "opal/sys/ia64/atomic.h"
180179
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
181180
#include "opal/sys/powerpc/atomic.h"
182181
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64

opal/include/opal/sys/cma.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
4545
#define __NR_process_vm_readv 347
4646
#define __NR_process_vm_writev 348
47-
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
48-
#define __NR_process_vm_readv 1332
49-
#define __NR_process_vm_writev 1333
5047
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
5148
#define __NR_process_vm_readv 351
5249
#define __NR_process_vm_writev 352

opal/include/opal/sys/timer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Copyright (c) 2016-2017 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* Copyright (c) 2020 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2020 Google, LLC. All rights reserved.
1718
* $COPYRIGHT$
1819
*
1920
* Additional copyrights may follow
@@ -79,8 +80,6 @@ BEGIN_C_DECLS
7980
#include "opal/sys/arm64/timer.h"
8081
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
8182
#include "opal/sys/ia32/timer.h"
82-
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
83-
#include "opal/sys/ia64/timer.h"
8483
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
8584
#include "opal/sys/powerpc/timer.h"
8685
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64

0 commit comments

Comments
 (0)