summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-03 07:03:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:37 +0100
commit476edb2b472b5dc35bf00b02a629db2ada512df3 (patch)
tree895f73139fb7e4c4cf9c6b89edc3b0b617cf9e0c
parentffe6130bf6c8eed4ce1cc137ead47c0e293d98d2 (diff)
downloadpoky-476edb2b472b5dc35bf00b02a629db2ada512df3.tar.gz
glibc: Upgrade to 2.26 final release
(From OE-Core rev: d6a0bc57fa07d887a78aa8ed76e3bf4558dc5127) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.26.bb (renamed from meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb)5
-rw-r--r--meta/recipes-core/glibc/glibc-initial_2.26.bb (renamed from meta/recipes-core/glibc/glibc-initial_2.25.90.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.26.bb (renamed from meta/recipes-core/glibc/glibc-locale_2.25.90.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace_2.26.bb (renamed from meta/recipes-core/glibc/glibc-mtrace_2.25.90.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-scripts_2.26.bb (renamed from meta/recipes-core/glibc/glibc-scripts_2.25.90.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch90
-rw-r--r--meta/recipes-core/glibc/glibc_2.26.bb (renamed from meta/recipes-core/glibc/glibc_2.25.90.bb)6
8 files changed, 96 insertions, 7 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 8ffb8ad046..2754136405 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ GCCVERSION ?= "7.%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.28%" 27BINUVERSION ?= "2.28%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.0%"
29GLIBCVERSION ?= "2.25%" 29GLIBCVERSION ?= "2.26%"
30LINUXLIBCVERSION ?= "4.10%" 30LINUXLIBCVERSION ?= "4.10%"
31 31
32PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb b/meta/recipes-core/glibc/cross-localedef-native_2.26.bb
index 5dd0c70400..fc5d70dbb9 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.25.90.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.26.bb
@@ -17,12 +17,11 @@ inherit autotools
17 17
18FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" 18FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
19 19
20#SRCBRANCH ?= "release/${PV}/master" 20SRCBRANCH ?= "release/${PV}/master"
21SRCBRANCH ?= "master"
22GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
24 23
25SRCREV_glibc ?= "43a9f537fc121a867981ca31ea9d79f33ce0fd24" 24SRCREV_glibc ?= "1c9a5c270d8b66f30dcfaf1cb2d6cf39d3e18369"
26SRCREV_localedef ?= "dfb4afe551c6c6e94f9cc85417bd1f582168c843" 25SRCREV_localedef ?= "dfb4afe551c6c6e94f9cc85417bd1f582168c843"
27 26
28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 27SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
diff --git a/meta/recipes-core/glibc/glibc-initial_2.25.90.bb b/meta/recipes-core/glibc/glibc-initial_2.26.bb
index e86770e12d..e86770e12d 100644
--- a/meta/recipes-core/glibc/glibc-initial_2.25.90.bb
+++ b/meta/recipes-core/glibc/glibc-initial_2.26.bb
diff --git a/meta/recipes-core/glibc/glibc-locale_2.25.90.bb b/meta/recipes-core/glibc/glibc-locale_2.26.bb
index f7702e0358..f7702e0358 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.25.90.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.26.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.25.90.bb b/meta/recipes-core/glibc/glibc-mtrace_2.26.bb
index 0b69bad46a..0b69bad46a 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.25.90.bb
+++ b/meta/recipes-core/glibc/glibc-mtrace_2.26.bb
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.25.90.bb b/meta/recipes-core/glibc/glibc-scripts_2.26.bb
index 5a89bd8022..5a89bd8022 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.25.90.bb
+++ b/meta/recipes-core/glibc/glibc-scripts_2.26.bb
diff --git a/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch b/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch
new file mode 100644
index 0000000000..b2bb96b818
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch
@@ -0,0 +1,90 @@
1From 037283cbc74739b72f36dfec827d120faa243406 Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer at redhat dot com>
3Date: Thu, 6 Jul 2017 11:50:55 +0200
4Subject: [PATCH 26/26] assert: Suppress pedantic warning caused by statement
5 expression [BZ# 21242]
6
7On 07/05/2017 10:15 PM, Zack Weinberg wrote:
8> On Wed, Jul 5, 2017 at 11:51 AM, Florian Weimer <fweimer@redhat.com> wrote:
9>> On 07/05/2017 05:46 PM, Zack Weinberg wrote:
10>>> A problem occurs to me: expressions involving VLAs _are_ evaluated
11>>> inside sizeof.
12>>
13>> The type of the sizeof argument would still be int (due to the
14>> comparison against 0), so this doesn't actually occur.
15>
16> I rechecked what C99 says about sizeof and VLAs, and you're right -
17> the operand of sizeof is only evaluated when sizeof is _directly_
18> applied to a VLA. So this is indeed safe, but I think this wrinkle
19> should be mentioned in the comment. Perhaps
20>
21> /* The first occurrence of EXPR is not evaluated due to the sizeof,
22> but will trigger any pedantic warnings masked by the __extension__
23> for the second occurrence. The explicit comparison against zero
24> ensures that sizeof is not directly applied to a function pointer or
25> bit-field (which would be ill-formed) or VLA (which would be evaluated). */
26>
27> zw
28
29What about the attached patch?
30
31Siddhesh, is this okay during the freeze? I'd like to backport it to
322.25 as well.
33
34Thanks,
35Florian
36
37assert: Suppress pedantic warning caused by statement expression
38
392017-07-06 Florian Weimer <fweimer@redhat.com>
40
41 [BZ #21242]
42 * assert/assert.h [__GNUC__ && !__STRICT_ANSI__] (assert):
43 Suppress pedantic warning resulting from statement expression.
44 (__ASSERT_FUNCTION): Add missing __extendsion__.
45---
46
47Upstream-Status: Submitted
48Signed-off-by: Khem Raj <raj.khem@gmail.com>
49
50 assert/assert.h | 12 +++++++++---
51 1 file changed, 9 insertions(+), 3 deletions(-)
52
53diff --git a/assert/assert.h b/assert/assert.h
54index 22f019537c..6801cfeb10 100644
55--- a/assert/assert.h
56+++ b/assert/assert.h
57@@ -91,13 +91,19 @@ __END_DECLS
58 ? __ASSERT_VOID_CAST (0) \
59 : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
60 # else
61+/* The first occurrence of EXPR is not evaluated due to the sizeof,
62+ but will trigger any pedantic warnings masked by the __extension__
63+ for the second occurrence. The explicit comparison against zero is
64+ required to support function pointers and bit fields in this
65+ context, and to suppress the evaluation of variable length
66+ arrays. */
67 # define assert(expr) \
68- ({ \
69+ ((void) sizeof ((expr) == 0), __extension__ ({ \
70 if (expr) \
71 ; /* empty */ \
72 else \
73 __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION); \
74- })
75+ }))
76 # endif
77
78 # ifdef __USE_GNU
79@@ -113,7 +119,7 @@ __END_DECLS
80 C9x has a similar variable called __func__, but prefer the GCC one since
81 it demangles C++ function names. */
82 # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
83-# define __ASSERT_FUNCTION __PRETTY_FUNCTION__
84+# define __ASSERT_FUNCTION __extension__ __PRETTY_FUNCTION__
85 # else
86 # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
87 # define __ASSERT_FUNCTION __func__
88--
892.13.3
90
diff --git a/meta/recipes-core/glibc/glibc_2.25.90.bb b/meta/recipes-core/glibc/glibc_2.26.bb
index caf1ff4138..d453d8f9bf 100644
--- a/meta/recipes-core/glibc/glibc_2.25.90.bb
+++ b/meta/recipes-core/glibc/glibc_2.26.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
7 7
8DEPENDS += "gperf-native" 8DEPENDS += "gperf-native"
9 9
10SRCREV ?= "43a9f537fc121a867981ca31ea9d79f33ce0fd24" 10SRCREV ?= "1c9a5c270d8b66f30dcfaf1cb2d6cf39d3e18369"
11 11
12#SRCBRANCH ?= "release/${PV}/master" 12SRCBRANCH ?= "release/${PV}/master"
13SRCBRANCH ?= "master"
14 13
15GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
@@ -41,6 +40,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
41 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 40 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
42 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ 41 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
43 file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \ 42 file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \
43 file://0026-assert-Suppress-pedantic-warning-caused-by-statement.patch \
44" 44"
45 45
46NATIVESDKFIXES ?= "" 46NATIVESDKFIXES ?= ""