Skip to content

Commit 1c52d9d

Browse files
committed
opal/asm: clean up no longer supported architectures
We no longer officially support MIPS or ARM before v6. This commit updates the configury to check for sync builtins on these architectures and removes the MIPS and IA64 assembly from opal/include/opal/sys. Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 6dd718a commit 1c52d9d

File tree

10 files changed

+6
-556
lines changed

10 files changed

+6
-556
lines changed

config/opal_config_asm.m4

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -957,8 +957,8 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
957957
958958
ia64-*)
959959
opal_cv_asm_arch="IA64"
960-
OPAL_ASM_SUPPORT_64BIT=1
961-
OPAL_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
960+
OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"],
961+
[AC_MSG_ERROR([No atomic primitives available for $host])])
962962
;;
963963
aarch64*)
964964
opal_cv_asm_arch="ARM64"
@@ -991,20 +991,16 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
991991
armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
992992
# uses Linux kernel helpers for some atomic operations
993993
opal_cv_asm_arch="ARM"
994-
OPAL_ASM_SUPPORT_64BIT=0
995-
OPAL_ASM_ARM_VERSION=5
996-
CCASFLAGS="$CCASFLAGS -march=armv7-a"
997-
AC_DEFINE_UNQUOTED([OPAL_ASM_ARM_VERSION], [$OPAL_ASM_ARM_VERSION],
998-
[What ARM assembly version to use])
999-
OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
994+
OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"],
995+
[AC_MSG_ERROR([No atomic primitives available for $host])])
1000996
;;
1001997
1002998
mips-*|mips64*)
1003999
# Should really find some way to make sure that we are on
10041000
# a MIPS III machine (r4000 and later)
10051001
opal_cv_asm_arch="MIPS"
1006-
OPAL_ASM_SUPPORT_64BIT=1
1007-
OPAL_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
1002+
OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"],
1003+
[AC_MSG_ERROR([No atomic primitives available for $host])])
10081004
;;
10091005
10101006
powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)

opal/include/opal/sys/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ include opal/sys/x86_64/Makefile.am
3535
include opal/sys/arm/Makefile.am
3636
include opal/sys/arm64/Makefile.am
3737
include opal/sys/ia32/Makefile.am
38-
include opal/sys/ia64/Makefile.am
39-
include opal/sys/mips/Makefile.am
4038
include opal/sys/powerpc/Makefile.am
4139
include opal/sys/sparcv9/Makefile.am
4240
include opal/sys/sync_builtin/Makefile.am

opal/include/opal/sys/ia64/Makefile.am

Lines changed: 0 additions & 23 deletions
This file was deleted.

opal/include/opal/sys/ia64/atomic.h

Lines changed: 0 additions & 145 deletions
This file was deleted.

opal/include/opal/sys/ia64/timer.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

opal/include/opal/sys/ia64/update.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

opal/include/opal/sys/mips/Makefile.am

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)