diff options
author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2013-03-15 21:27:27 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-16 17:53:58 +0000 |
commit | 175c5ceaf6cc9ba707b72a75a89d1f990d691158 (patch) | |
tree | b460f627b3acf08999d6369219803ffcab570093 /meta/recipes-devtools/elfutils | |
parent | 23acf50dff3f806c18e576da043dbceb4ac310b3 (diff) | |
download | poky-175c5ceaf6cc9ba707b72a75a89d1f990d691158.tar.gz |
elfutils: fix the num passed to memset in ar.c
Following build error will appear on Fedora18+:
ar.c: In function 'do_oper_delete':
ar.c:918:31: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Werror=sizeof-pointer-memaccess]
memset (found, '\0', sizeof (found));
(From OE-Core rev: 5cc3b4fe09cfa2b3e67568a9c2494c198a5292af)
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils')
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.148.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch b/meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch new file mode 100644 index 0000000000..b619619ec0 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | ar.c (do_oper_delete): Fix num passed to memset | ||
4 | native build failed as following on Fedora18+: | ||
5 | ar.c: In function 'do_oper_delete': | ||
6 | ar.c:918:31: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Werror=sizeof-pointer-memaccess] | ||
7 | memset (found, '\0', sizeof (found)); | ||
8 | ^ | ||
9 | The original commit is http://git.fedorahosted.org/cgit/elfutils.git/commit/src/ar.c?id=1a4d0668d18bf1090c5c08cdb5cb3ba2b8eb5410 | ||
10 | |||
11 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
12 | |||
13 | --- elfutils-0.148/src/ar.c.org 2013-03-12 21:12:17.928281375 -0500 | ||
14 | +++ elfutils-0.148/src/ar.c 2013-03-12 21:15:30.053285271 -0500 | ||
15 | @@ -915,7 +915,7 @@ | ||
16 | long int instance) | ||
17 | { | ||
18 | bool *found = alloca (sizeof (bool) * argc); | ||
19 | - memset (found, '\0', sizeof (found)); | ||
20 | + memset (found, '\0', sizeof (bool) * argc); | ||
21 | |||
22 | /* List of the files we keep. */ | ||
23 | struct armem *to_copy = NULL; | ||
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb index bc9e9c6ec2..e8d58fbde5 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\ | |||
6 | file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417" | 6 | file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417" |
7 | DEPENDS = "libtool bzip2 zlib virtual/libintl" | 7 | DEPENDS = "libtool bzip2 zlib virtual/libintl" |
8 | 8 | ||
9 | PR = "r10" | 9 | PR = "r11" |
10 | 10 | ||
11 | SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" | 11 | SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" |
12 | 12 | ||
@@ -32,6 +32,7 @@ SRC_URI += "\ | |||
32 | file://fix_for_gcc-4.7.patch \ | 32 | file://fix_for_gcc-4.7.patch \ |
33 | file://dso-link-change.patch \ | 33 | file://dso-link-change.patch \ |
34 | file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ | 34 | file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ |
35 | file://elfutils-ar-c-fix-num-passed-to-memset.patch \ | ||
35 | " | 36 | " |
36 | # Only apply when building uclibc based target recipe | 37 | # Only apply when building uclibc based target recipe |
37 | SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" | 38 | SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" |