Permalink
Browse files

core: Update to commit d84caf0.

mupen64plus/mupen64plus-core@d84caf0

*   d84caf0 Merge pull request #123 from Gillou68310/textrel
|\
| * d0aa600 new_dynarec: Cleanup linkage_arm.S
| * 17ae404 Avoid .text relocations in PIC shared library
|/
* 87b9b57 Revert "Avoid .text relocations in PIC shared library", because according to Gillou68310 this change causes crash at start of Conker's BFD on android.
* 86a8673 Merge pull request #122 from bentley/openbsd
* f62e8f8 OpenBSD has had good support for mupen64plus for multiple releases now.
  • Loading branch information...
unknown unknown
unknown authored and unknown committed Jun 16, 2015
1 parent 0488d08 commit 14f135d9738c6c1404dfcfabc95cf58bbf720938
Showing with 923 additions and 1,240 deletions.
  1. +0 −1 jni/mupen64plus-core/projects/unix/Makefile
  2. +923 −1,239 jni/mupen64plus-core/src/r4300/new_dynarec/arm/linkage_arm.S
@@ -42,7 +42,6 @@ endif
ifeq ("$(UNAME)","OpenBSD")
OS = FREEBSD
CFLAGS += -DIOAPI_NO_64
$(warning OS type "$(UNAME)" not officially supported.')
endif
ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
OS = LINUX
Oops, something went wrong.

0 comments on commit 14f135d

Please sign in to comment.