From 316dfdd917bec6a218f431211d28bf8df6b6fb0f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 25 Jun 2018 12:45:53 -0400 Subject: Yocto 2.5 Move OpenBMC to Yocto 2.5(sumo) Signed-off-by: Brad Bishop Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78 --- .../gperftools/0001-Support-Atomic-ops-on-clang.patch | 16 +++++++--------- ...01-Use-ucontext_t-instead-of-struct-ucontext.patch | 8 +++----- ...le-heap-checkers-and-debug-allocator-on-musl.patch | 13 +++++++------ .../gperftools/0001-fix-build-with-musl-libc.patch | 6 ++---- .../0001-include-fcntl.h-for-loff_t-definition.patch | 6 ++---- .../gperftools/disable_libunwind_aarch64.patch | 19 +++++++++++++------ .../gperftools/gperftools/sgidef.patch | 18 +++++++++++++----- 7 files changed, 47 insertions(+), 39 deletions(-) (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/gperftools') diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch index e582c0da6..2fd21c278 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch @@ -1,4 +1,4 @@ -From ea9f64eb2cdf3be6c4dc65fa1472d854616e43ca Mon Sep 17 00:00:00 2001 +From aa0a63209af6813d87255ec3ab339f2dbbf27d6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Mar 2017 13:38:46 -0800 Subject: [PATCH] Support Atomic ops on clang @@ -9,25 +9,23 @@ gcc 4.2, here it depends on gcc 4.7 to enable the atomics and fails for clang Signed-off-by: Khem Raj ---- + Upstream-Status: Pending +--- src/base/atomicops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/atomicops.h b/src/base/atomicops.h -index be038f3..f1a21ff 100644 +index dac95be..390733c 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ #include "base/atomicops-internals-linuxppc.h" #elif defined(__GNUC__) && defined(__mips__) #include "base/atomicops-internals-mips.h" -#elif defined(__GNUC__) && GCC_VERSION >= 40700 +#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) #include "base/atomicops-internals-gcc.h" - #else - #error You need to implement atomic operations for this architecture --- -2.12.0 - + #elif defined(__clang__) && CLANG_VERSION >= 30400 + #include "base/atomicops-internals-gcc.h" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch index 5bd0b6fa4..b3033621b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch @@ -1,4 +1,4 @@ -From 12ac0dc6742e1bcdfaf1842186c9002f0820a5e8 Mon Sep 17 00:00:00 2001 +From 230cd84486145c5bb1d69d4c9a544e00adbcc9b5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 Jul 2017 13:21:21 -0700 Subject: [PATCH] Use ucontext_t instead of struct ucontext @@ -6,12 +6,13 @@ Subject: [PATCH] Use ucontext_t instead of struct ucontext Newer glibc has dropped the ucontext tag from exposing Signed-off-by: Khem Raj + --- src/stacktrace_powerpc-linux-inl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index a9bf775..47ff2d7 100644 +index 3b3843b..a301a46 100644 --- a/src/stacktrace_powerpc-linux-inl.h +++ b/src/stacktrace_powerpc-linux-inl.h @@ -53,7 +53,6 @@ @@ -31,6 +32,3 @@ index a9bf775..47ff2d7 100644 // We don't care about the rest, since IP value is at 'uc' field.A } *sigframe = reinterpret_cast(current); result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; --- -2.13.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index 99127e11a..ab3ceb964 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch @@ -1,19 +1,20 @@ -From b5961f17e9d7f2bc44da611b3e4b27c8a641fc72 Mon Sep 17 00:00:00 2001 +From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Sep 2017 08:07:17 -0700 Subject: [PATCH] disbale heap checkers and debug allocator on musl Signed-off-by: Khem Raj ---- + Upstream-Status: Pending +--- configure.ac | 2 ++ 1 file changed, 2 insertions(+) -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac +diff --git a/configure.ac b/configure.ac +index 70b49a3..8154c5c 100644 +--- a/configure.ac ++++ b/configure.ac @@ -51,6 +51,8 @@ case "$host" in *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; *-freebsd*) default_enable_heap_checker=no;; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch index 78621c7fe..0a72ff27c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch @@ -1,4 +1,4 @@ -From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From 034e7da08c3fbffcba8cf8d4e24a71a16558db5a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 16 Jul 2017 15:51:28 -0700 Subject: [PATCH] fix build with musl libc @@ -6,6 +6,7 @@ Subject: [PATCH] fix build with musl libc Patch from https://github.com/gperftools/gperftools/pull/765/ Signed-off-by: Khem Raj + --- configure.ac | 1 + src/malloc_hook_mmap_linux.h | 8 ++++++-- @@ -56,6 +57,3 @@ index 79ac4e3..d444635 100755 // libc's version: extern "C" void* __sbrk(ptrdiff_t increment); --- -2.13.3 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch index 667008a5b..4c63e73b3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch @@ -1,4 +1,4 @@ -From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From a16a73f0819d26219ee83cd98eea82786d7c1755 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 16 Jul 2017 19:28:17 -0700 Subject: [PATCH] include fcntl.h for loff_t definition @@ -7,6 +7,7 @@ Fixes linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared Signed-off-by: Khem Raj + --- src/base/linux_syscall_support.h | 1 + 1 file changed, 1 insertion(+) @@ -23,6 +24,3 @@ index 85347a2..70431ca 100644 #ifdef __mips__ /* Include definitions of the ABI currently in use. */ --- -2.13.3 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch index f2647404b..c3c578418 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch @@ -1,15 +1,22 @@ -Disable libunwind on aarch64 +From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Sep 2017 12:02:04 -0700 +Subject: [PATCH] Disable libunwind on aarch64 Fixes hangs when using libtcmalloc.so Upstream-Status: Pending Signed-off-by: Khem Raj -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8154c5c..063b260 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __PPC64__])], [default_enable_libunwind=yes default_tcmalloc_pagesize=8]) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch index 7e1a23bf6..10274a6de 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch @@ -1,11 +1,19 @@ -sgidef.h does not exist on musl and its not needed to compile +From 259b420444c52463795b4b582a2ab7511149eea7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 16 Oct 2017 21:26:40 -0700 +Subject: [PATCH] sgidef.h does not exist on musl and its not needed to compile Signed-off-by: Khem Raj Upstream-Status: Pending -Index: git/src/base/linux_syscall_support.h -=================================================================== ---- git.orig/src/base/linux_syscall_support.h -+++ git/src/base/linux_syscall_support.h + +--- + src/base/linux_syscall_support.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h +index 70431ca..b23ca59 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h @@ -164,7 +164,7 @@ extern "C" { #include #include -- cgit v1.2.1