aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/hipe/hipe_amd64_glue.S
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-10-24 18:23:47 +0200
committerSverker Eriksson <[email protected]>2014-10-24 18:23:47 +0200
commit1b50468c0389adbe51883f32a73c265ef0b7605d (patch)
tree2f35d6e7bac2a1a4ae14c56ca0b649eb4c7d43de /erts/emulator/hipe/hipe_amd64_glue.S
parent389b65126d2777cf61a7995e082b00ef7a0e7778 (diff)
parentda3073e8d3d26ec6c63979a22c913d7758eeed71 (diff)
downloadotp-1b50468c0389adbe51883f32a73c265ef0b7605d.tar.gz
otp-1b50468c0389adbe51883f32a73c265ef0b7605d.tar.bz2
otp-1b50468c0389adbe51883f32a73c265ef0b7605d.zip
Merge branch 'sverk/hipe-inline-reserve-trap-frame'
* sverk/hipe-inline-reserve-trap-frame: erts: Extend usage of ASM macro to avoid including asm macros in C code erts: Make hipe_{un}reserve_beam_trap_frame INLINE
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_glue.S')
-rw-r--r--erts/emulator/hipe/hipe_amd64_glue.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_glue.S b/erts/emulator/hipe/hipe_amd64_glue.S
index bebe0a8fd1..955f7362b4 100644
--- a/erts/emulator/hipe/hipe_amd64_glue.S
+++ b/erts/emulator/hipe/hipe_amd64_glue.S
@@ -17,10 +17,9 @@
* %CopyrightEnd%
*/
-
+#define ASM
#include "hipe_amd64_asm.h"
#include "hipe_literals.h"
-#define ASM
#include "hipe_mode_switch.h"
/*