Skip to content

Commit af0b5cf

Browse files
ggouaillardetggouaillardet
committed
asm: rename the AMD64 into X86_64
in this context, AMD64 really means amd64 or em64t, so let's rename this into X86_64 in order to avoid any confusion Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent ab5e86c commit af0b5cf

22 files changed

+62
-32
lines changed

‎config/opal_config_asm.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,15 +1004,15 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
10041004
OPAL_ASM_SUPPORT_64BIT=0
10051005
case "${host}" in
10061006
x86_64-*x32)
1007-
opal_cv_asm_arch="AMD64"
1007+
opal_cv_asm_arch="X86_64"
10081008
OPAL_ASM_SUPPORT_64BIT=1
10091009
OPAL_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
10101010
;;
10111011
i?86-*|x86_64*)
10121012
if test "$ac_cv_sizeof_long" = "4" ; then
10131013
opal_cv_asm_arch="IA32"
10141014
else
1015-
opal_cv_asm_arch="AMD64"
1015+
opal_cv_asm_arch="X86_64"
10161016
fi
10171017
OPAL_ASM_SUPPORT_64BIT=1
10181018
OPAL_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
@@ -1193,7 +1193,7 @@ AC_MSG_ERROR([Can not continue.])
11931193
11941194
# Check for RDTSCP support
11951195
result=0
1196-
AS_IF([test "$opal_cv_asm_arch" = "OPAL_AMD64" || test "$opal_cv_asm_arch" = "OPAL_IA32"],
1196+
AS_IF([test "$opal_cv_asm_arch" = "OPAL_X86_64" || test "$opal_cv_asm_arch" = "OPAL_IA32"],
11971197
[AC_MSG_CHECKING([for RDTSCP assembly support])
11981198
AC_LANG_PUSH([C])
11991199
AC_TRY_RUN([[

‎ompi/mca/osc/portals4/osc_portals4_component.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2011-2017 Sandia National Laboratories. All rights reserved.
44
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
55
* reserved.
6-
* Copyright (c) 2015 Research Organization for Information Science
6+
* Copyright (c) 2015-2017 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
88
* $COPYRIGHT$
99
*
@@ -590,7 +590,7 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
590590

591591
module->passive_target_access_epoch = false;
592592

593-
#if OPAL_ASSEMBLY_ARCH == OPAL_AMD64 || OPAL_ASSEMBLY_ARCH == OPAL_IA32
593+
#if OPAL_ASSEMBLY_ARCH == OPAL_X86_64 || OPAL_ASSEMBLY_ARCH == OPAL_IA32
594594
*model = MPI_WIN_UNIFIED;
595595
#else
596596
*model = MPI_WIN_SEPARATE;

‎opal/asm/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2017 Research Organization for Information Science
14+
# and Technology (RIST). All rights reserved.
1315
# $COPYRIGHT$
1416
#
1517
# Additional copyrights may follow
@@ -63,7 +65,7 @@ EXTRA_DIST = \
6365
generate-all-asm.pl \
6466
base/aix.conf \
6567
base/default.conf \
66-
base/AMD64.asm \
68+
base/X86_64.asm \
6769
base/ARM.asm \
6870
base/IA32.asm \
6971
base/IA64.asm \

‎opal/asm/asm-data.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2014 Intel, Inc. All rights reserved.
13+
# Copyright (c) 2017 Research Organization for Information Science
14+
# and Technology (RIST). All rights reserved.
1315
# $COPYRIGHT$
1416
#
1517
# Additional copyrights may follow
@@ -34,8 +36,8 @@
3436
#
3537
######################################################################
3638

37-
AMD64 default-.text-.globl-:--.L-@-1-0-1-1-1 amd64-linux
38-
AMD64 default-.text-.globl-:--.L-@-1-0-1-1-0 amd64-linux-nongas
39+
X86_64 default-.text-.globl-:--.L-@-1-0-1-1-1 x86_64-linux
40+
X86_64 default-.text-.globl-:--.L-@-1-0-1-1-0 x86_64-linux-nongas
3941

4042

4143
######################################################################

‎opal/asm/base/AMD64.asm renamed to ‎opal/asm/base/X86_64.asm

File renamed without changes.

‎opal/include/opal/sys/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1414
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1515
# reserved.
16+
# Copyright (c) 2017 Research Organization for Information Science
17+
# and Technology (RIST). All rights reserved.
1618
# $COPYRIGHT$
1719
#
1820
# Additional copyrights may follow
@@ -29,7 +31,7 @@ headers += \
2931
opal/sys/timer.h \
3032
opal/sys/cma.h
3133

32-
include opal/sys/amd64/Makefile.am
34+
include opal/sys/x86_64/Makefile.am
3335
include opal/sys/arm/Makefile.am
3436
include opal/sys/arm64/Makefile.am
3537
include opal/sys/ia32/Makefile.am

‎opal/include/opal/sys/architecture.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Copyright (c) 2014 Intel, Inc. All rights reserved
1414
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1515
* reserved.
16+
* Copyright (c) 2017 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1618
* $COPYRIGHT$
1719
*
1820
* Additional copyrights may follow
@@ -31,7 +33,7 @@
3133
#define OPAL_UNSUPPORTED 0000
3234
#define OPAL_IA32 0010
3335
#define OPAL_IA64 0020
34-
#define OPAL_AMD64 0030
36+
#define OPAL_X86_64 0030
3537
#define OPAL_POWERPC32 0050
3638
#define OPAL_POWERPC64 0051
3739
#define OPAL_SPARC 0060

‎opal/include/opal/sys/atomic.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1515
* Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights
1616
* reserved.
17+
* Copyright (c) 2017 Research Organization for Information Science
18+
* and Technology (RIST). All rights reserved.
1719
* $COPYRIGHT$
1820
*
1921
* Additional copyrights may follow
@@ -153,8 +155,8 @@ enum {
153155
#include "opal/sys/gcc_builtin/atomic.h"
154156
#elif OPAL_ASSEMBLY_BUILTIN == OPAL_BUILTIN_OSX
155157
#include "opal/sys/osx/atomic.h"
156-
#elif OPAL_ASSEMBLY_ARCH == OPAL_AMD64
157-
#include "opal/sys/amd64/atomic.h"
158+
#elif OPAL_ASSEMBLY_ARCH == OPAL_X86_64
159+
#include "opal/sys/x86_64/atomic.h"
158160
#elif OPAL_ASSEMBLY_ARCH == OPAL_ARM
159161
#include "opal/sys/arm/atomic.h"
160162
#elif OPAL_ASSEMBLY_ARCH == OPAL_ARM64

‎opal/include/opal/sys/cma.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/*
2-
* Copyright (c) 2011-2012 IBM Corporation. All rights reserved.
3-
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
4-
* reserved.
5-
*
2+
* Copyright (c) 2011-2012 IBM Corporation. All rights reserved.
3+
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
4+
* reserved.
5+
* Copyright (c) 2017 Research Organization for Information Science
6+
* and Technology (RIST). All rights reserved.
7+
* $COPYRIGHT$
68
*/
79

810
/** @file
@@ -35,7 +37,7 @@
3537

3638
/* Cross Memory Attach is so far only supported under linux */
3739

38-
#if OPAL_ASSEMBLY_ARCH == OPAL_AMD64
40+
#if OPAL_ASSEMBLY_ARCH == OPAL_X86_64
3941
#define __NR_process_vm_readv 310
4042
#define __NR_process_vm_writev 311
4143
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32

‎opal/include/opal/sys/timer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ BEGIN_C_DECLS
8484

8585
#if defined(DOXYGEN)
8686
/* don't include system-level gorp when generating doxygen files */
87-
#elif OPAL_ASSEMBLY_ARCH == OPAL_AMD64
88-
#include "opal/sys/amd64/timer.h"
87+
#elif OPAL_ASSEMBLY_ARCH == OPAL_X86_64
88+
#include "opal/sys/x86_64/timer.h"
8989
#elif OPAL_ASSEMBLY_ARCH == OPAL_ARM
9090
#include "opal/sys/arm/timer.h"
9191
#elif OPAL_ASSEMBLY_ARCH == OPAL_ARM64

0 commit comments

Comments
 (0)