diff options
| author | Rickard Green <[email protected]> | 2013-07-12 12:38:28 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-07-12 12:38:28 +0200 |
| commit | 257f41f238503043aaf92e709f5fc3e7e188a1ac (patch) | |
| tree | 811918f638a4f63886c7dc5010feaf02c2b60844 /lib | |
| parent | ffd35b50df2d2878f4701b13088801f3d5cf7a49 (diff) | |
| parent | 5bf8edea8ef0b90683d4226a500acf54ad7c53f1 (diff) | |
| download | otp-257f41f238503043aaf92e709f5fc3e7e188a1ac.tar.gz otp-257f41f238503043aaf92e709f5fc3e7e188a1ac.tar.bz2 otp-257f41f238503043aaf92e709f5fc3e7e188a1ac.zip | |
Merge branch 'maint'
* maint:
Fix configure detection of ethread native atomics on powerpc
Diffstat (limited to 'lib')
| -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 |
4 files changed, 4 insertions, 4 deletions
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;; |