diff options
| author | Henrik Nord <[email protected]> | 2014-06-11 10:53:28 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-06-11 10:53:28 +0200 |
| commit | 18615c8555c38b98486d5e29257178f06c810a09 (patch) | |
| tree | 881dced29f66239417b72992e4a8cf97999fe936 /erts | |
| parent | 7372e3e8adc6cc9f0b59a4bc47ea0a1af3e5fd1f (diff) | |
| parent | 3dd95149212105fd796cb6f03901e0f6a0b94575 (diff) | |
| download | otp-18615c8555c38b98486d5e29257178f06c810a09.tar.gz otp-18615c8555c38b98486d5e29257178f06c810a09.tar.bz2 otp-18615c8555c38b98486d5e29257178f06c810a09.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | erts/emulator/beam/erl_bif_info.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | erts/emulator/beam/global.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | erts/emulator/sys/win32/sys.c | 0 |
4 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 diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 4d5e55aaf5..4d5e55aaf5 100755..100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 891046a8b5..891046a8b5 100755..100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index ae44c8424f..ae44c8424f 100755..100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c |