diff options
| author | Sverker Eriksson <[email protected]> | 2012-07-04 18:52:08 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-07-04 18:52:55 +0200 |
| commit | 1bc0714f0146cedf7b407c54dbd79817f3b9294c (patch) | |
| tree | d85c5f0001ce8dd5a428e29b69c5d6d569e78209 /erts/emulator/Makefile.in | |
| parent | 14f6a66f6410e1665ad39e95158420b0a45634d6 (diff) | |
| parent | b8489354a77dc41f707f85b5b31d3fabd788d69e (diff) | |
| download | otp-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/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 04069b517a..985ef72517 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -924,6 +924,11 @@ $(TTF_DIR)/hipe_arm_bifs.S: hipe/hipe_arm_bifs.m4 hipe/hipe_arm_asm.m4 \ $(OBJDIR)/hipe_arm_bifs.o: $(TTF_DIR)/hipe_arm_bifs.S \ $(TTF_DIR)/hipe_literals.h +# Use -fomit-frame-pointer to work around gcc (v4.5.2) bug causing +# "error: r7 cannot be used in asm here" for DEBUG build. +$(OBJDIR)/hipe_arm.o: hipe/hipe_arm.c + $(CC) $(subst O2,O3, $(CFLAGS)) -fomit-frame-pointer $(INCLUDES) -c $< -o $@ + # end of HiPE section ######################################## |