summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-08-29 17:30:12 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:38 +0100
commitbd02a3851c95ebdfcf2d3c672fab15a3be1df08e (patch)
tree03c4538fc9a74179c2df2fa9d254ec4d6b470a0c /meta
parent32ac9347d66e0df4d59c1e211aca5e2909ecb937 (diff)
downloadpoky-bd02a3851c95ebdfcf2d3c672fab15a3be1df08e.tar.gz
bdwgc: update to 7.6.0
Remove backported NIOS2 patch. README.QUICK checksum updated; the license part of the file is unchaged. (From OE-Core rev: ee16cc4ad552502212055af46b3e97a312a13e69) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch71
-rw-r--r--meta/recipes-support/bdwgc/bdwgc_7.6.0.bb (renamed from meta/recipes-support/bdwgc/bdwgc_7.4.4.bb)7
2 files changed, 3 insertions, 75 deletions
diff --git a/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch b/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
deleted file mode 100644
index c73c5400cf..0000000000
--- a/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 2571df0e30b4976d7a12dbc6fbec4f1c4027924d Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Thu, 28 Jan 2016 04:13:13 +0100
4Subject: [PATCH] Altera NIOS2 support
5
6Add simple nios2 configuration support.
7
8* include/private/gcconfig.h (NIOS2): New macro.
9* include/private/gcconfig.h (mach_type_known, CPP_WORDSZ, MACH_TYPE,
10OS_TYPE, DYNAMIC_LOADING, _end, __data_start, DATASTART, DATAEND,
11ALIGNMENT, HBLKSIZE, HBLKSIZE, LINUX_STACKBOTTOM, NO_GETCONTEXT):
12Define for NIOS2.
13
14Signed-off-by: Marek Vasut <marex@denx.de>
15Upstream-Status: Backport [ https://github.com/ivmai/bdwgc.git 2571df0e30b4976d7a12dbc6fbec4f1c4027924d ]
16---
17 include/private/gcconfig.h | 24 +++++++++++++++++++++++-
18 1 file changed, 23 insertions(+), 1 deletion(-)
19
20diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
21index c467c26..92d4727 100644
22--- a/include/private/gcconfig.h
23+++ b/include/private/gcconfig.h
24@@ -181,6 +181,10 @@
25 # endif
26 # define mach_type_known
27 # endif
28+# if defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__)
29+# define NIOS2 /* Altera NIOS2 */
30+# define mach_type_known
31+# endif
32 # if defined(DGUX) && (defined(i386) || defined(__i386__))
33 # define I386
34 # ifndef _USING_DGUX
35@@ -1658,6 +1662,24 @@
36 # endif
37 # endif
38
39+# ifdef NIOS2
40+# define CPP_WORDSZ 32
41+# define MACH_TYPE "NIOS2"
42+# ifdef LINUX
43+# define OS_TYPE "LINUX"
44+# define DYNAMIC_LOADING
45+ extern int _end[];
46+ extern int __data_start[];
47+# define DATASTART ((ptr_t)(__data_start))
48+# define DATAEND ((ptr_t)(_end))
49+# define ALIGNMENT 4
50+# ifndef HBLKSIZE
51+# define HBLKSIZE 4096
52+# endif
53+# define LINUX_STACKBOTTOM
54+# endif /* Linux */
55+# endif
56+
57 # ifdef HP_PA
58 # define MACH_TYPE "HP_PA"
59 # ifdef __LP64__
60@@ -2622,6 +2644,7 @@
61 #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
62 || defined(OPENBSD) || defined(ARM32) \
63- || defined(MIPS) || defined(AVR32))) \
64+ || defined(MIPS) || defined(AVR32) \
65+ || defined(NIOS2))) \
66 || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
67 || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \
68 && !defined(NO_GETCONTEXT)
69--
702.7.0
71
diff --git a/meta/recipes-support/bdwgc/bdwgc_7.4.4.bb b/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb
index 600ced7983..55ea452068 100644
--- a/meta/recipes-support/bdwgc/bdwgc_7.4.4.bb
+++ b/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb
@@ -19,12 +19,11 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\
19HOMEPAGE = "http://www.hboehm.info/gc/" 19HOMEPAGE = "http://www.hboehm.info/gc/"
20SECTION = "devel" 20SECTION = "devel"
21LICENSE = "MIT" 21LICENSE = "MIT"
22LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" 22LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3"
23 23
24SRCREV = "d8bfa89c2a9c7c86fb98acbc53b5750600b95492" 24SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa"
25SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_4 \ 25SRC_URI = "git://github.com/ivmai/bdwgc.git \
26 file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ 26 file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \
27 file://0002-Altera-NIOS2-support.patch \
28 " 27 "
29 28
30FILES_${PN}-doc = "${datadir}" 29FILES_${PN}-doc = "${datadir}"