mirror of
https://git.yoctoproject.org/poky
synced 2026-10-15 17:07:16 +00:00
elfutils: fix compilations issue with the gcc 4.7
(From OE-Core rev: 291483a20933cc70a49c2acadc9891bea2158564) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
1 parent
860d8fdd27
commit
2c81d95059
17 files changed
+75
-1
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,73 @@
|
||||
UpstreamStatus: pending
|
||||
gcc 4.7 does not like pointer conversion, so have a void * tmp var to work
|
||||
around following compilation issue.
|
||||
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2011/07/07
|
||||
|
||||
| md5.c: In function 'md5_finish_ctx':
|
||||
| md5.c:108:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
|
||||
| md5.c:109:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
|
||||
| cc1: all warnings being treated as errors
|
||||
|
|
||||
| make[2]: *** [md5.o] Error 1
|
||||
| make[2]: *** Waiting for unfinished jobs....
|
||||
| sha1.c: In function 'sha1_finish_ctx':
|
||||
| sha1.c:109:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
|
||||
| sha1.c:111:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
|
||||
| cc1: all warnings being treated as errors
|
||||
|
|
||||
| make[2]: *** [sha1.o] Error 1
|
||||
|
||||
Index: elfutils-0.148/lib/md5.c
|
||||
===================================================================
|
||||
--- elfutils-0.148.orig/lib/md5.c
|
||||
+++ elfutils-0.148/lib/md5.c
|
||||
@@ -95,6 +95,7 @@ md5_finish_ctx (ctx, resbuf)
|
||||
/* Take yet unprocessed bytes into account. */
|
||||
md5_uint32 bytes = ctx->buflen;
|
||||
size_t pad;
|
||||
+ void * tmp;
|
||||
|
||||
/* Now count remaining bytes. */
|
||||
ctx->total[0] += bytes;
|
||||
@@ -105,9 +106,10 @@ md5_finish_ctx (ctx, resbuf)
|
||||
memcpy (&ctx->buffer[bytes], fillbuf, pad);
|
||||
|
||||
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
||||
- *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
|
||||
- *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
|
||||
- (ctx->total[0] >> 29));
|
||||
+ tmp = &ctx->buffer[bytes + pad];
|
||||
+ *(md5_uint32 *) tmp = SWAP (ctx->total[0] << 3);
|
||||
+ tmp = &ctx->buffer[bytes + pad + 4];
|
||||
+ *(md5_uint32 *) tmp = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
||||
|
||||
/* Process last bytes. */
|
||||
md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
|
||||
Index: elfutils-0.148/lib/sha1.c
|
||||
===================================================================
|
||||
--- elfutils-0.148.orig/lib/sha1.c
|
||||
+++ elfutils-0.148/lib/sha1.c
|
||||
@@ -96,6 +96,7 @@ sha1_finish_ctx (ctx, resbuf)
|
||||
/* Take yet unprocessed bytes into account. */
|
||||
sha1_uint32 bytes = ctx->buflen;
|
||||
size_t pad;
|
||||
+ void * tmp;
|
||||
|
||||
/* Now count remaining bytes. */
|
||||
ctx->total[0] += bytes;
|
||||
@@ -106,9 +107,10 @@ sha1_finish_ctx (ctx, resbuf)
|
||||
memcpy (&ctx->buffer[bytes], fillbuf, pad);
|
||||
|
||||
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
||||
- *(sha1_uint32 *) &ctx->buffer[bytes + pad] = SWAP ((ctx->total[1] << 3) |
|
||||
- (ctx->total[0] >> 29));
|
||||
- *(sha1_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total[0] << 3);
|
||||
+ tmp = &ctx->buffer[bytes + pad];
|
||||
+ *(sha1_uint32 *) tmp = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
||||
+ tmp = &ctx->buffer[bytes + pad + 4];
|
||||
+ *(sha1_uint32 *) tmp = SWAP (ctx->total[0] << 3);
|
||||
|
||||
/* Process last bytes. */
|
||||
sha1_process_block (ctx->buffer, bytes + pad + 8, ctx);
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
|
||||
file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
|
||||
DEPENDS = "libtool bzip2 zlib"
|
||||
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
|
||||
|
||||
@@ -29,6 +29,7 @@ SRC_URI += "\
|
||||
file://elfutils-fsize.patch \
|
||||
file://remove-unused.patch \
|
||||
file://mempcpy.patch \
|
||||
file://fix_for_gcc-4.7.patch\
|
||||
"
|
||||
# Only apply when building uclibc based target recipe
|
||||
SRC_URI_append_libc-uclibc = " ${@['', 'file://uclibc-support.patch']['${PN}' == '${BPN}']}"
|
||||
|
||||
Reference in new issue
Block a user