aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-07-04 18:52:08 +0200
committerSverker Eriksson <[email protected]>2012-07-04 18:52:55 +0200
commit1bc0714f0146cedf7b407c54dbd79817f3b9294c (patch)
treed85c5f0001ce8dd5a428e29b69c5d6d569e78209 /erts/configure.in
parent14f6a66f6410e1665ad39e95158420b0a45634d6 (diff)
parentb8489354a77dc41f707f85b5b31d3fabd788d69e (diff)
downloadotp-1bc0714f0146cedf7b407c54dbd79817f3b9294c.tar.gz
otp-1bc0714f0146cedf7b407c54dbd79817f3b9294c.tar.bz2
otp-1bc0714f0146cedf7b407c54dbd79817f3b9294c.zip
Merge branch 'sverk/hipe-arm-fix' into maint
* sverk/hipe-arm-fix: hipe_arm.c: remove dead code Workaround gcc bug affecting ARM debug build Fix compile error of HIPE enabled DEBUG emulator for ARM Fix hipe bif calling bug on ARM Add armv7l and armv5tejl as a recognized ARM architectures OTP-10137
Diffstat (limited to 'erts/configure.in')
-rw-r--r--erts/configure.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 500d1490e9..b3289bf84c 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -618,6 +618,8 @@ case $chk_arch_ in
armv5b) ARCH=arm;;
armv5teb) ARCH=arm;;
armv5tel) ARCH=arm;;
+ armv5tejl) ARCH=arm;;
+ armv7l) ARCH=arm;;
tile) ARCH=tile;;
*) ARCH=noarch;;
esac