diff options
author | Anthony Green <green@gmachine.(none)> | 2010-01-01 08:08:02 -0500 |
---|---|---|
committer | Anthony Green <green@gmachine.(none)> | 2010-01-01 08:08:02 -0500 |
commit | c3042afaf3f84abbbe9c91bf9bc9896b0d9eb003 (patch) | |
tree | 223d8e00be3d77a10e797be93a23bf1fc074b02f /src/closures.c | |
parent | b0304e9679bdfec6ac45a57b5c96542697249418 (diff) | |
download | libffi-c3042afaf3f84abbbe9c91bf9bc9896b0d9eb003.tar.gz |
Reset quilt patches post 3.0.9 merge with GCC
Diffstat (limited to 'src/closures.c')
-rw-r--r-- | src/closures.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/closures.c b/src/closures.c index bc087d9..0b156e0 100644 --- a/src/closures.c +++ b/src/closures.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - closures.c - Copyright (c) 2007, 2009 Red Hat, Inc. + closures.c - Copyright (c) 2007 Red Hat, Inc. Copyright (C) 2007, 2009 Free Software Foundation, Inc Code to allocate and deallocate memory for closures. @@ -209,8 +209,6 @@ static int dlmunmap(void *, size_t); #if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) -#if FFI_MMAP_EXEC_SELINUX - /* A mutex used to synchronize access to *exec* variables in this file. */ static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -480,27 +478,6 @@ dlmmap (void *start, size_t length, int prot, return dlmmap_locked (start, length, prot, flags, offset); } -#else - -static void * -dlmmap (void *start, size_t length, int prot, - int flags, int fd, off_t offset) -{ - - assert (start == NULL && length % malloc_getpagesize == 0 - && prot == (PROT_READ | PROT_WRITE) - && flags == (MAP_PRIVATE | MAP_ANONYMOUS) - && fd == -1 && offset == 0); - -#if FFI_CLOSURE_TEST - printf ("mapping in %zi\n", length); -#endif - - return mmap (start, length, prot | PROT_EXEC, flags, fd, offset); -} - -#endif - /* Release memory at the given address, as well as the corresponding executable page if it's separate. */ static int |