summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2021-02-16 08:43:02 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-17 11:01:17 +0000
commitd01e2b5c146b21a5504c1ee3a7edeabd49ebdb3d (patch)
tree6fa6634442b89d331a3bdcd18204ffa26e348fbe
parent60d317796afe25d16f146349528a1a15021b2fbf (diff)
downloadpoky-d01e2b5c146b21a5504c1ee3a7edeabd49ebdb3d.tar.gz
bison: Fix up file name mapping
File name mapping was added to bison, but needs to be applied in more cases. Add a patch to enable file name mapping for symbols (From OE-Core rev: 5a213506377b0db4e88ca094215eadf08c21a2e1) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch62
-rw-r--r--meta/recipes-devtools/bison/bison_3.7.5.bb1
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch b/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch
new file mode 100644
index 0000000000..568ee4df19
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/0001-Use-mapped-file-name-for-symbols.patch
@@ -0,0 +1,62 @@
1From 2a3db4e3b8d33bad5577c2fcfe124ee7a202ef4f Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Mon, 15 Feb 2021 20:39:57 -0600
4Subject: [PATCH] Use mapped file name for symbols
5
6Applies the file name mapping before exporting it as a symbol. This
7allows the symbols to correctly respect the --file-prefix-map command
8line option.
9
10Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
11Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bison-patches/2021-02/msg00014.html]
12---
13 src/muscle-tab.c | 4 +++-
14 src/output.c | 8 ++++++--
15 2 files changed, 9 insertions(+), 3 deletions(-)
16
17diff --git a/src/muscle-tab.c b/src/muscle-tab.c
18index b610d0b8..3e7657ca 100644
19--- a/src/muscle-tab.c
20+++ b/src/muscle-tab.c
21@@ -204,8 +204,10 @@ static void
22 muscle_syncline_grow (char const *key, location loc)
23 {
24 obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line);
25+ char *f = map_file_name (loc.start.file);
26 obstack_quote (&muscle_obstack,
27- quotearg_style (c_quoting_style, loc.start.file));
28+ quotearg_style (c_quoting_style, f));
29+ free (f);
30 obstack_sgrow (&muscle_obstack, ")dnl\n[");
31 char const *extension = obstack_finish0 (&muscle_obstack);
32 muscle_grow (key, extension, "", "");
33diff --git a/src/output.c b/src/output.c
34index 391d8e65..34dbc671 100644
35--- a/src/output.c
36+++ b/src/output.c
37@@ -531,7 +531,9 @@ user_actions_output (FILE *out)
38 {
39 fprintf (out, "b4_syncline(%d, ",
40 rules[r].action_loc.start.line);
41- string_output (out, rules[r].action_loc.start.file);
42+ char *f = map_file_name (rules[r].action_loc.start.file);
43+ string_output (out, f);
44+ free(f);
45 fprintf (out, ")dnl\n");
46 }
47 fprintf (out, "[%*s%s]],\n[[",
48@@ -629,8 +631,10 @@ prepare_symbol_definitions (void)
49
50 if (p->code)
51 {
52+ char *f = map_file_name (p->location.start.file);
53 SET_KEY2 (pname, "file");
54- MUSCLE_INSERT_C_STRING (key, p->location.start.file);
55+ MUSCLE_INSERT_C_STRING (key, f);
56+ free (f);
57
58 SET_KEY2 (pname, "line");
59 MUSCLE_INSERT_INT (key, p->location.start.line);
60--
612.30.0
62
diff --git a/meta/recipes-devtools/bison/bison_3.7.5.bb b/meta/recipes-devtools/bison/bison_3.7.5.bb
index f8263f93a3..c8bbea4454 100644
--- a/meta/recipes-devtools/bison/bison_3.7.5.bb
+++ b/meta/recipes-devtools/bison/bison_3.7.5.bb
@@ -11,6 +11,7 @@ DEPENDS = "bison-native flex-native"
11 11
12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ 12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
13 file://add-with-bisonlocaledir.patch \ 13 file://add-with-bisonlocaledir.patch \
14 file://0001-Use-mapped-file-name-for-symbols.patch \
14 " 15 "
15SRC_URI[sha256sum] = "e8c53bc5bc396d636622d0f25e31ca92fd53f00b09629f13ef540d564a6b31ab" 16SRC_URI[sha256sum] = "e8c53bc5bc396d636622d0f25e31ca92fd53f00b09629f13ef540d564a6b31ab"
16 17