From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- .../files/0001-Use-labs-instead-of-abs.patch | 46 ---------------------- ...1-palisade-Fix-warnings-with-clang-on-arm.patch | 24 +++++------ ...hange-string-lenght-parameter-to-be-size_.patch | 34 ++++++++++++++++ .../fix-compiling-failure-with-option-g-O.patch | 23 +++++------ .../puzzles/files/fix-ki-uninitialized.patch | 25 ++++++++++++ 5 files changed, 81 insertions(+), 71 deletions(-) delete mode 100644 external/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch create mode 100644 external/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch create mode 100644 external/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch (limited to 'external/poky/meta/recipes-sato/puzzles/files') diff --git a/external/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/external/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch deleted file mode 100644 index f43d1df6..00000000 --- a/external/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9808dc09e08937c9bffd858d3ded428225a4312a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 7 Sep 2015 09:02:38 +0000 -Subject: [PATCH] Use labs instead of abs - -cluevals is array of longs so we have to use labs() instead of abs() -since abs() returns int - -Fixes - -keen.c:1458:17: error: absolute value function 'abs' given an argument -of type 'long' but has parameter of type 'int' which may cause -truncation of value - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - keen.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keen.c b/keen.c -index a6a7238..1631992 100644 ---- a/keen.c -+++ b/keen.c -@@ -1043,7 +1043,7 @@ done - cluevals[j] *= grid[i]; - break; - case C_SUB: -- cluevals[j] = abs(cluevals[j] - grid[i]); -+ cluevals[j] = labs(cluevals[j] - grid[i]); - break; - case C_DIV: - { -@@ -1455,7 +1455,7 @@ static int check_errors(const game_state *state, long *errors) - cluevals[j] *= state->grid[i]; - break; - case C_SUB: -- cluevals[j] = abs(cluevals[j] - state->grid[i]); -+ cluevals[j] = labs(cluevals[j] - state->grid[i]); - break; - case C_DIV: - { --- -2.5.1 - diff --git a/external/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/external/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch index 5351f8eb..143e898a 100644 --- a/external/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +++ b/external/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch @@ -1,7 +1,7 @@ -From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001 +From 453587d714473b806473b309727f865b673cbc06 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jan 2016 23:10:19 -0800 -Subject: [puzzles][PATCH] palisade: Fix warnings with clang on arm +Subject: [PATCH] palisade: Fix warnings with clang on arm ARM treats 'char' as unsigned char when 'char' is not qualified with 'signed' or 'unsigned' explicitly. @@ -16,17 +16,16 @@ type 'clue' (aka 'char') is always false Therefore, typcast the contant to char in such places to be explicit Signed-off-by: Khem Raj ---- Upstream-Status: Submitted - +--- palisade.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/palisade.c b/palisade.c -index 984e616..2b9c25c 100644 +index 6ffbf2d..8b54d42 100644 --- a/palisade.c +++ b/palisade.c -@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) +@@ -304,11 +304,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx) * If p = q = 3 then the region has size exactly 2. */ for (i = 0; i < wh; ++i) { @@ -40,8 +39,8 @@ index 984e616..2b9c25c 100644 if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) || (ctx->clues[i] == 3 && ctx->clues[j] == 3 && ctx->params->k != 2)) -@@ -317,7 +317,7 @@ static int solver_number_exhausted(solver_ctx *ctx) - int changed = FALSE; +@@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx) + bool changed = false; for (i = 0; i < wh; ++i) { - if (ctx->clues[i] == EMPTY) continue; @@ -49,16 +48,16 @@ index 984e616..2b9c25c 100644 if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) { for (dir = 0; dir < 4; ++dir) { -@@ -528,7 +528,7 @@ static int is_solved(const game_params *params, clue *clues, +@@ -538,7 +538,7 @@ static bool is_solved(const game_params *params, clue *clues, for (i = 0; i < wh; ++i) { - if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, TRUE); + if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, true); if (dsf_size(dsf, i) != k) goto error; - if (clues[i] == EMPTY) continue; + if (clues[i] == (char)EMPTY) continue; if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error; } -@@ -674,7 +674,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, +@@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, p = numbers; r = 0; for (i = 0; i < wh; ++i) { @@ -67,6 +66,3 @@ index 984e616..2b9c25c 100644 while (r) { while (r > 26) { *p++ = 'z'; --- -2.7.0 - diff --git a/external/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch b/external/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch new file mode 100644 index 00000000..7ca582fe --- /dev/null +++ b/external/poky/meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch @@ -0,0 +1,34 @@ +From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 7 Mar 2019 21:56:57 -0800 +Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in + do_row() + +This fixes below error on some architectures e.g. RISC-V + +pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] 455 | memset(deduced, DOT, (size_t)len); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +--- + pattern.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pattern.c b/pattern.c +index ffadd3f..4e5f187 100644 +--- a/pattern.c ++++ b/pattern.c +@@ -428,7 +428,7 @@ static bool do_row(unsigned char *known, unsigned char *deduced, + unsigned char *row, + unsigned char *minpos_done, unsigned char *maxpos_done, + unsigned char *minpos_ok, unsigned char *maxpos_ok, +- unsigned char *start, int len, int step, int *data, ++ unsigned char *start, size_t len, int step, int *data, + unsigned int *changed + #ifdef STANDALONE_SOLVER + , const char *rowcol, int index, int cluewid +-- +2.17.1 + diff --git a/external/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/external/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch index c134acde..28040523 100644 --- a/external/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +++ b/external/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch @@ -1,4 +1,7 @@ -gtk.c: fix compiling failure with option -g -O +From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 11 Aug 2014 12:39:53 +0800 +Subject: [PATCH] gtk.c: fix compiling failure with option -g -O There were compiling failure with option -g -O ... @@ -21,23 +24,21 @@ Initialized pointer 'cr' and 'error' with NULL Upstream-Status: Pending Signed-off-by: Hongxu Jia + --- - gtk.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + gtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk.c b/gtk.c -index a2eba2c..c54bf63 100644 +index 4565836..5e83b48 100644 --- a/gtk.c +++ b/gtk.c -@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) +@@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu) int main(int argc, char **argv) { char *pname = argv[0]; - char *error; + char *error = NULL; - int ngenerate = 0, print = FALSE, px = 1, py = 1; - int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE; - int soln = FALSE, colour = FALSE; --- -1.9.1 - + int ngenerate = 0, px = 1, py = 1; + bool print = false; + bool time_generation = false, test_solve = false, list_presets = false; diff --git a/external/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/external/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch new file mode 100644 index 00000000..7218d620 --- /dev/null +++ b/external/poky/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch @@ -0,0 +1,25 @@ +puzzles: avoid compiler unitialized variable error + +The compiler does not realize that we must go through the while() +loop at least once, so we replace it with a for() loop. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater + +--- a/tree234.c ++++ b/tree234.c +@@ -326,8 +326,11 @@ static void *add234_internal(tree234 *t, + return orig_e; + } + +- n = t->root; +- while (n) { ++ /* ++ * We know t->root is not NULL. The logic ++ * to break out of this is at the end of the loop. ++ */ ++ for (n = t->root;;) { + LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", + n, + n->kids[0], n->counts[0], n->elems[0], -- cgit 1.2.3-korg