diff options
| author | Sverker Eriksson <[email protected]> | 2012-11-13 15:32:26 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-11-13 15:32:26 +0100 |
| commit | 574b023712de7923d04e91e8919aabdcfb6232b8 (patch) | |
| tree | 9baefa6c23a5b74dec089673e63a15f48b9e2492 /erts/emulator/hipe/hipe_bif_list.m4 | |
| parent | 27e544f51c93c058153444876ea5cc0c7516f3fd (diff) | |
| parent | a31e27e84ea3d0449f737b7cf421c1b55e98421a (diff) | |
| download | otp-574b023712de7923d04e91e8919aabdcfb6232b8.tar.gz otp-574b023712de7923d04e91e8919aabdcfb6232b8.tar.bz2 otp-574b023712de7923d04e91e8919aabdcfb6232b8.zip | |
Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maint
* sverk/hipe-solaris-m4-bug/OTP-10577:
erts: Change assembler comment for hipe on x86 and amd64
erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
Diffstat (limited to 'erts/emulator/hipe/hipe_bif_list.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_bif_list.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4 index 942fa0c5cb..7f78ddd57f 100644 --- a/erts/emulator/hipe/hipe_bif_list.m4 +++ b/erts/emulator/hipe/hipe_bif_list.m4 @@ -245,7 +245,7 @@ noproc_primop_interface_5(nbif_bs_put_big_integer, hipe_bs_put_big_integer) gc_bif_interface_0(nbif_check_get_msg, hipe_check_get_msg) -#ifdef NO_FPE_SIGNALS +#`ifdef' NO_FPE_SIGNALS nocons_nofail_primop_interface_0(nbif_emulate_fpe, hipe_emulate_fpe) #endif |