diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-01 11:53:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-01 11:53:09 +0200 |
| commit | fa5f3dffb5f93645bf6a4d2af2b78084395f0875 (patch) | |
| tree | 99b1b3b239dd43a572bd64dfb8e2da11ed1a2a42 /lib | |
| parent | 132e46f29297ab3de25b33bd52ddbad078900276 (diff) | |
| parent | 105cc37ee041873c201bf1d0673b0ee071842758 (diff) | |
| download | otp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.tar.gz otp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.tar.bz2 otp-fa5f3dffb5f93645bf6a4d2af2b78084395f0875.zip | |
Merge branch 'bjorn/halfword-emulator' into dev
* bjorn/halfword-emulator:
Fix a bug in the ERTS_BIF_PREP_TRAPx() macros
ts_install: Identify the halfword emulator
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_server/src/ts_install.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl index bbbb7883db..2ddffccf5b 100644 --- a/lib/test_server/src/ts_install.erl +++ b/lib/test_server/src/ts_install.erl @@ -226,9 +226,11 @@ to_upper(String) -> String). word_size() -> - case erlang:system_info(wordsize) of - 4 -> ""; - 8 -> "/64" + case {erlang:system_info({wordsize,external}), + erlang:system_info({wordsize,internal})} of + {4,4} -> ""; + {8,8} -> "/64"; + {8,4} -> "/Halfword" end. linux_dist() -> |