diff options
| author | Rickard Green <[email protected]> | 2013-07-12 12:37:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-07-12 12:37:27 +0200 |
| commit | 5bf8edea8ef0b90683d4226a500acf54ad7c53f1 (patch) | |
| tree | 2c44d5f0431b33ff80b2787b2a3f5a1f0f183890 | |
| parent | c89952668959197d2295f73cb483bede44fb8520 (diff) | |
| parent | 4f54774403276bc02d4a59aac172afeda8a331f4 (diff) | |
| download | otp-5bf8edea8ef0b90683d4226a500acf54ad7c53f1.tar.gz otp-5bf8edea8ef0b90683d4226a500acf54ad7c53f1.tar.bz2 otp-5bf8edea8ef0b90683d4226a500acf54ad7c53f1.zip | |
Merge branch 'rickard/info/OTP-11196' into maint
* rickard/info/OTP-11196:
Fix configure detection of ethread native atomics on powerpc
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | erts/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/erl_interface/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/megaco/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/odbc/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/wx/aclocal.m4 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/lib/erl_interface/aclocal.m4 +++ b/lib/erl_interface/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; diff --git a/lib/megaco/aclocal.m4 b/lib/megaco/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/lib/megaco/aclocal.m4 +++ b/lib/megaco/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; diff --git a/lib/odbc/aclocal.m4 b/lib/odbc/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/lib/odbc/aclocal.m4 +++ b/lib/odbc/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4 index aeb31fa58a..46b30a16b3 100644 --- a/lib/wx/aclocal.m4 +++ b/lib/wx/aclocal.m4 @@ -1423,7 +1423,7 @@ case "$THR_LIB_NAME" in AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized]) fi ethr_have_native_atomics=yes;; - macppc | ppc | "Power Macintosh") + macppc | ppc | powerpc | "Power Macintosh") ethr_have_native_atomics=yes;; tile) ethr_have_native_atomics=yes;; |