aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch')
-rw-r--r--common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch b/common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch
deleted file mode 100644
index 61252381..00000000
--- a/common/recipes-devtools/codexl/codexl/0019-Miniz-fix-build-with-gcc6.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5355b447698b2f4b4047f9e2101665fd626d01ff Mon Sep 17 00:00:00 2001
-From: Awais Belal <awais_belal@mentor.com>
-Date: Wed, 16 Nov 2016 14:47:32 +0500
-Subject: [PATCH] Miniz: fix build with gcc6
-
-This covers up the build failure of Miniz with gcc6. This
-is a direct port of
-https://github.com/bog-dan-ro/common-src-Miniz/commit/e653cb505b07873b852518b4ac72274c273a8328
-
-Signed-off-by: Awais Belal <awais_belal@mentor.com>
----
- Common/Src/Miniz/miniz.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/Common/Src/Miniz/miniz.c b/Common/Src/Miniz/miniz.c
-index 73afcf1..e96596a 100755
---- a/Common/Src/Miniz/miniz.c
-+++ b/Common/Src/Miniz/miniz.c
-@@ -821,7 +821,7 @@ size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void
-
- // Compresses an image to a compressed PNG file in memory.
- // On entry:
--// pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4.
-+// pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4.
- // The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory.
- // level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL
- // If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps).
-@@ -1497,7 +1497,10 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
- {
- mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i;
- r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
-- for ( i = 0; i <= 143; ++i) *p++ = 8; for ( ; i <= 255; ++i) *p++ = 9; for ( ; i <= 279; ++i) *p++ = 7; for ( ; i <= 287; ++i) *p++ = 8;
-+ for ( i = 0; i <= 143; ++i) *p++ = 8;
-+ for ( ; i <= 255; ++i) *p++ = 9;
-+ for ( ; i <= 279; ++i) *p++ = 7;
-+ for ( ; i <= 287; ++i) *p++ = 8;
- }
- else
- {
-@@ -2281,7 +2284,10 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
- if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) break;
- TDEFL_PROBE; TDEFL_PROBE; TDEFL_PROBE;
- }
-- if (!dist) break; q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) continue; p = s; probe_len = 32;
-+ if (!dist) break;
-+ q = (const mz_uint16*)(d->m_dict + probe_pos);
-+ if (TDEFL_READ_UNALIGNED_WORD(q) != s01) continue;
-+ p = s; probe_len = 32;
- do { } while ( (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) &&
- (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (--probe_len > 0) );
- if (!probe_len)
-@@ -4441,7 +4447,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
-
- if (!mz_zip_get_file_modified_time(pSrc_filename, &dos_time, &dos_date))
- return MZ_FALSE;
--
-+
- pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
- if (!pSrc_file)
- return MZ_FALSE;
---
-1.9.1
-