diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/bdwgc')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch | 35 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch | 71 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch | 27 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb (renamed from import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb) | 9 |
4 files changed, 31 insertions, 111 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch deleted file mode 100644 index ab907fca0..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 829a89e7f5785239a9384e3afd46c900f9d76ada Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 Aug 2015 19:55:32 +0000 -Subject: [PATCH] fix build with musl - -signal.h already includes bits/sigcontext.h -Documentation seems to indicate that if you need the definitions in -sigcontext.h, you are supposed to include signal.h and not sigcontext.h. - -a good fix should be to remove glibc -specific understanding, in those ifdef's - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - os_dep.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/os_dep.c b/os_dep.c -index 08c501d..5cb7873 100644 ---- a/os_dep.c -+++ b/os_dep.c -@@ -41,7 +41,7 @@ - # else /* __GLIBC__ < 2 */ - /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ - /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include <asm/sigcontext.h> -+# include <signal.h> - # endif /* __GLIBC__ < 2 */ - # endif - #endif /* LINUX && !POWERPC */ --- -2.5.1 - diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch deleted file mode 100644 index c73c5400c..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2571df0e30b4976d7a12dbc6fbec4f1c4027924d Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Thu, 28 Jan 2016 04:13:13 +0100 -Subject: [PATCH] Altera NIOS2 support - -Add simple nios2 configuration support. - -* include/private/gcconfig.h (NIOS2): New macro. -* include/private/gcconfig.h (mach_type_known, CPP_WORDSZ, MACH_TYPE, -OS_TYPE, DYNAMIC_LOADING, _end, __data_start, DATASTART, DATAEND, -ALIGNMENT, HBLKSIZE, HBLKSIZE, LINUX_STACKBOTTOM, NO_GETCONTEXT): -Define for NIOS2. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [ https://github.com/ivmai/bdwgc.git 2571df0e30b4976d7a12dbc6fbec4f1c4027924d ] ---- - include/private/gcconfig.h | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h -index c467c26..92d4727 100644 ---- a/include/private/gcconfig.h -+++ b/include/private/gcconfig.h -@@ -181,6 +181,10 @@ - # endif - # define mach_type_known - # endif -+# if defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__) -+# define NIOS2 /* Altera NIOS2 */ -+# define mach_type_known -+# endif - # if defined(DGUX) && (defined(i386) || defined(__i386__)) - # define I386 - # ifndef _USING_DGUX -@@ -1658,6 +1662,24 @@ - # endif - # endif - -+# ifdef NIOS2 -+# define CPP_WORDSZ 32 -+# define MACH_TYPE "NIOS2" -+# ifdef LINUX -+# define OS_TYPE "LINUX" -+# define DYNAMIC_LOADING -+ extern int _end[]; -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)(__data_start)) -+# define DATAEND ((ptr_t)(_end)) -+# define ALIGNMENT 4 -+# ifndef HBLKSIZE -+# define HBLKSIZE 4096 -+# endif -+# define LINUX_STACKBOTTOM -+# endif /* Linux */ -+# endif -+ - # ifdef HP_PA - # define MACH_TYPE "HP_PA" - # ifdef __LP64__ -@@ -2622,6 +2644,7 @@ - #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ - || defined(OPENBSD) || defined(ARM32) \ -- || defined(MIPS) || defined(AVR32))) \ -+ || defined(MIPS) || defined(AVR32) \ -+ || defined(NIOS2))) \ - || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ - || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \ - && !defined(NO_GETCONTEXT) --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch new file mode 100644 index 000000000..4a1849665 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc/musl_header_fix.patch @@ -0,0 +1,27 @@ +Add missing header to avoid: + +| 1472659610.016355: ../git/pthread_stop_world.c: In function 'GC_brief_async_signal_safe_sleep': +| 1472659610.0540252: ../git/pthread_stop_world.c:397:22: error: storage size of 'tv' isn't known +| 1472659610.0540252: struct timeval tv; +| 1472659610.0540252: ^~ +| 1472659610.054099: ../git/pthread_stop_world.c:397:22: warning: unused variable 'tv' [-Wunused-variable] +| 1472659610.054099: struct timeval tv; +| 1472659610.054099: ^~ +| 1472659610.054099: Makefile:1530: recipe for target 'pthread_stop_world.lo' failed + +in musl builds. + +Upstream-Status: Pending + +Index: git/pthread_stop_world.c +=================================================================== +--- git.orig/pthread_stop_world.c ++++ git/pthread_stop_world.c +@@ -45,6 +45,7 @@ + #include <semaphore.h> + #include <errno.h> + #include <unistd.h> ++#include <sys/time.h> + #include "atomic_ops.h" + + /* It's safe to call original pthread_sigmask() here. */ diff --git a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb index 8d4dab399..dcb68f028 100644 --- a/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb +++ b/import-layers/yocto-poky/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb @@ -19,13 +19,12 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ HOMEPAGE = "http://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3" -SRCREV = "e31cdc288ffbee5bf25f948e19deb5a7ce846971" -SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_4 \ - file://0001-fix-build-with-musl.patch \ +SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa" +SRC_URI = "git://github.com/ivmai/bdwgc.git \ file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ - file://0002-Altera-NIOS2-support.patch \ + file://musl_header_fix.patch \ " FILES_${PN}-doc = "${datadir}" |