← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mozjs24/vivid

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-02-11 21:55:34 UTC
  • Revision ID: package-import@ubuntu.com-20140211215534-m1zyq5aj59md3y07
Tags: upstream-24.2.0
Import upstream version 24.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/src/ctypes/patches-libffi/02-bug-682180.patch
 
1
# HG changeset patch
 
2
# Parent 5e5eb679345b4d13b8e9ee40e253a97fd665dad3
 
3
diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
 
4
--- a/js/src/ctypes/libffi/configure
 
5
+++ b/js/src/ctypes/libffi/configure
 
6
@@ -12357,17 +12357,18 @@ fi
 
7
     if test "x$libffi_cv_as_string_pseudo_op" = xyes; then
 
8
 
 
9
 $as_echo "#define HAVE_AS_STRING_PSEUDO_OP 1" >>confdefs.h
 
10
 
 
11
     fi
 
12
 fi
 
13
 
 
14
 case "$target" in
 
15
-     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
 
16
+     # Darwin 10 (OSX 10.6) and beyond allocate non-executable pages
 
17
+     *-apple-darwin1* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
 
18
 
 
19
 $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
 
20
 
 
21
      ;;
 
22
 esac
 
23
 
 
24
 if test x$TARGET = xX86_64; then
 
25
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports unwind section type" >&5
 
26
diff --git a/js/src/ctypes/libffi/configure.ac b/js/src/ctypes/libffi/configure.ac
 
27
--- a/js/src/ctypes/libffi/configure.ac
 
28
+++ b/js/src/ctypes/libffi/configure.ac
 
29
@@ -311,17 +311,18 @@ if test x$TARGET = xX86 || test x$TARGET
 
30
     ])
 
31
     if test "x$libffi_cv_as_string_pseudo_op" = xyes; then
 
32
        AC_DEFINE(HAVE_AS_STRING_PSEUDO_OP, 1,
 
33
               [Define if your assembler supports .string.])
 
34
     fi
 
35
 fi
 
36
 
 
37
 case "$target" in
 
38
-     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
 
39
+     # Darwin 10 (OSX 10.6) and beyond allocate non-executable pages
 
40
+     *-apple-darwin1* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
 
41
        AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
 
42
                  [Cannot use malloc on this target, so, we revert to
 
43
                    alternative means])
 
44
      ;;
 
45
 esac
 
46
 
 
47
 if test x$TARGET = xX86_64; then
 
48
     AC_CACHE_CHECK([assembler supports unwind section type],