Skip to content

Commit 175a0d7

Browse files
committed
build: Fix platform detection on FreeBSD
Look for amd64 in addition to x86_64 as the platform type for x86_64 assembly. The FreeBSD-packaged Autoconf package has a patch to return amd64-unknown-freebsd11.0 instead of the x86_64-unknown-freebsd11.0 that a stock Autoconf package would return. Since we want to run Jenkins builds on FreeBSD, working around the FreeBSD patch is probably the easiest thing. Signed-off-by: Brian Barrett <[email protected]>
1 parent 03a6f54 commit 175a0d7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights
4646
reserved.
4747
Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
4848
Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
49+
Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights
50+
reserved.
4951

5052
$COPYRIGHT$
5153

config/opal_config_asm.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ dnl Copyright (c) 2015-2017 Research Organization for Information Science
1515
dnl and Technology (RIST). All rights reserved.
1616
dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
1717
dnl reserved.
18+
dnl Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights
19+
dnl reserved.
1820
dnl $COPYRIGHT$
1921
dnl
2022
dnl Additional copyrights may follow
@@ -1008,7 +1010,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
10081010
OPAL_ASM_SUPPORT_64BIT=1
10091011
OPAL_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
10101012
;;
1011-
i?86-*|x86_64*)
1013+
i?86-*|x86_64*|amd64*)
10121014
if test "$ac_cv_sizeof_long" = "4" ; then
10131015
opal_cv_asm_arch="IA32"
10141016
else

0 commit comments

Comments
 (0)