/js/src/ctypes/patches-libffi/02-bug-682180.patch

http://github.com/zpao/v8monkey · Patch · 27 lines · 23 code · 4 blank · 0 comment · 0 complexity · 7d7108020a9596f18512bdc7ab5f11ac MD5 · raw file 

    

  1. diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
    2. 

  2. index 2c08e1b..37e3055 100755
    3. 

  3. --- a/js/src/ctypes/libffi/configure
    4. 

  4. +++ b/js/src/ctypes/libffi/configure
    5. 

  5. @@ -12362,7 +12362,7 @@ $as_echo "#define HAVE_AS_STRING_PSEUDO_OP 1" >>confdefs.h
    6. 

  6.  fi
    7. 

  7.  
    8. 

  8.  case "$target" in
    9. 

  9. -     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
    10. 

  10. +     *-apple-darwin1* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
    11. 

  11.  
    12. 

  12.  $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
    13. 

  13.  
    14. 

  14. diff --git a/js/src/ctypes/libffi/configure.ac b/js/src/ctypes/libffi/configure.ac
    15. 

  15. index e85cff1..1db02ce 100644
    16. 

  16. --- a/js/src/ctypes/libffi/configure.ac
    17. 

  17. +++ b/js/src/ctypes/libffi/configure.ac
    18. 

  18. @@ -316,7 +316,8 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64
    19. 

  19.  fi
    20. 

  20.  
    21. 

  21.  case "$target" in
    22. 

  22. -     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
    23. 

  23. +     # Darwin 10 (OSX 10.6) and beyond allocate non-executable pages
    24. 

  24. +     *-apple-darwin1* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
    25. 

  25.         AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
    26. 

  26.                   [Cannot use malloc on this target, so, we revert to
    27. 

  27.                     alternative means])
    28.