aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-06-11 10:53:22 +0200
committerHenrik Nord <[email protected]>2014-06-11 10:53:22 +0200
commit3dd95149212105fd796cb6f03901e0f6a0b94575 (patch)
treede1da6804cf79342a2ce4b4c09753fa09509c50e
parent6faf4aa0994f91be5c8537ed7d048fbe1642a574 (diff)
parent8c4b42329f3e25e387a6511f9287c1f2bf8f2c4d (diff)
downloadotp-3dd95149212105fd796cb6f03901e0f6a0b94575.tar.gz
otp-3dd95149212105fd796cb6f03901e0f6a0b94575.tar.bz2
otp-3dd95149212105fd796cb6f03901e0f6a0b94575.zip
Merge branch 'matwey/arm' into maint
* matwey/arm: Add correct detection of powerpc architecture. Add correct detection of armv6hl and armv7hl architectures.
-rw-r--r--erts/configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 04303da4f8..f66110b98b 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -673,6 +673,7 @@ case $chk_arch_ in
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
+ powerpc) ARCH=ppc;;
ppc) ARCH=ppc;;
ppc64) ARCH=ppc64;;
"Power Macintosh") ARCH=ppc;;
@@ -680,8 +681,10 @@ case $chk_arch_ in
armv5teb) ARCH=arm;;
armv5tel) ARCH=arm;;
armv5tejl) ARCH=arm;;
- armv6l) ARCH=arm;;
+ armv6l) ARCH=arm;;
+ armv6hl) ARCH=arm;;
armv7l) ARCH=arm;;
+ armv7hl) ARCH=arm;;
tile) ARCH=tile;;
*) ARCH=noarch;;
esac