mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
gperftools: upgrade 2.7 -> 2.7.90
refresh 0001-fix-build-with-musl-libc.patch Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -6,26 +6,12 @@ Subject: [PATCH] fix build with musl libc
|
|||||||
Patch from https://github.com/gperftools/gperftools/pull/765/
|
Patch from https://github.com/gperftools/gperftools/pull/765/
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
configure.ac | 1 +
|
src/malloc_hook_mmap_linux.h | 6 +++++-
|
||||||
src/malloc_hook_mmap_linux.h | 8 ++++++--
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 497103e..f9efc3e 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -188,6 +188,7 @@ AC_HEADER_STDC
|
|
||||||
AC_CHECK_TYPES([__int64]) # defined in some windows platforms
|
|
||||||
AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>])
|
|
||||||
AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for vdso_support.h
|
|
||||||
+AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory allocator
|
|
||||||
AC_CHECK_FUNCS(sbrk) # for tcmalloc to get memory
|
|
||||||
AC_CHECK_FUNCS(geteuid) # for turning off services when run as root
|
|
||||||
AC_CHECK_FUNCS(fork) # for the pthread_atfork setup
|
|
||||||
diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h
|
diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h
|
||||||
index 2f6116f..0605855 100755
|
index e2efb05..66b3110 100644
|
||||||
--- a/src/malloc_hook_mmap_linux.h
|
--- a/src/malloc_hook_mmap_linux.h
|
||||||
+++ b/src/malloc_hook_mmap_linux.h
|
+++ b/src/malloc_hook_mmap_linux.h
|
||||||
@@ -46,6 +46,10 @@
|
@@ -46,6 +46,10 @@
|
||||||
@@ -39,7 +25,7 @@ index 2f6116f..0605855 100755
|
|||||||
// The x86-32 case and the x86-64 case differ:
|
// The x86-32 case and the x86-64 case differ:
|
||||||
// 32b has a mmap2() syscall, 64b does not.
|
// 32b has a mmap2() syscall, 64b does not.
|
||||||
// 64b and 32b have different calling conventions for mmap().
|
// 64b and 32b have different calling conventions for mmap().
|
||||||
@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
|
@@ -175,7 +179,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,12 +34,6 @@ index 2f6116f..0605855 100755
|
|||||||
|
|
||||||
extern "C" void* mmap(void *start, size_t length, int prot, int flags,
|
extern "C" void* mmap(void *start, size_t length, int prot, int flags,
|
||||||
int fd, off_t offset) __THROW {
|
int fd, off_t offset) __THROW {
|
||||||
@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
|
--
|
||||||
return result;
|
2.17.1
|
||||||
}
|
|
||||||
|
|
||||||
-#ifndef __UCLIBC__
|
|
||||||
+#if HAVE___SBRK
|
|
||||||
// libc's version:
|
|
||||||
extern "C" void* __sbrk(intptr_t increment);
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gperftools/gperftools"
|
|||||||
LICENSE = "BSD-3-Clause"
|
LICENSE = "BSD-3-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
|
||||||
|
|
||||||
SRCREV = "9608fa3bcf8020d35f59fbf70cd3cbe4b015b972"
|
SRCREV = "db7aa547abb5abdd558587a15502584cbc825438"
|
||||||
SRC_URI = "git://github.com/gperftools/gperftools \
|
SRC_URI = "git://github.com/gperftools/gperftools \
|
||||||
file://0001-Support-Atomic-ops-on-clang.patch \
|
file://0001-Support-Atomic-ops-on-clang.patch \
|
||||||
file://0001-fix-build-with-musl-libc.patch \
|
file://0001-fix-build-with-musl-libc.patch \
|
||||||
Reference in New Issue
Block a user