From a48175131ea54ba54d74857d90335db689b93fc7 Mon Sep 17 00:00:00 2001 From: Denys Zagorui Date: Wed, 11 Nov 2020 11:03:10 +0000 Subject: binutils: reproducibility: reuse debug-prefix-map for stabs powerpc 32bit Linux Kernel widely uses .stabs pseudo-op to produce debugging information in stabs format. Faced an issue that during Linux Kernel build with Yocto build system for 32bit powerpc platform resulting vmlinux contains absolute path in .stabstr section that cannot be remapped with -fdebug-prefix-map option. Yocto uses scripts/mkmakefile Linux Kernel build approach that allows to store all generated files outside of kernel source tree. With this approach each compilier invocation is performed with an absolute path to a file that will be compiled and this absolute path is recorded in init stab. There is no way to remap this path. Reuse remap_debug_filename api to make -fdebug-prefix-map flag aplicable for init stab. (From OE-Core rev: b90799fd0f38cd013bebadbe5b9c50b4f93e84af) Signed-off-by: Denys Zagorui Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils-2.34.inc | 1 + ...-reproducibility-for-stabs-debugging-data.patch | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0001-gas-improve-reproducibility-for-stabs-debugging-data.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc index f65fdb7328..b5f5a1c69a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.34.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -43,5 +43,6 @@ SRC_URI = "\ file://0016-Check-for-clang-before-checking-gcc-version.patch \ file://0017-binutils-drop-redundant-program_name-definition-fno-.patch \ file://CVE-2020-0551.patch \ + file://0001-gas-improve-reproducibility-for-stabs-debugging-data.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0001-gas-improve-reproducibility-for-stabs-debugging-data.patch b/meta/recipes-devtools/binutils/binutils/0001-gas-improve-reproducibility-for-stabs-debugging-data.patch new file mode 100644 index 0000000000..98dab1b41d --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0001-gas-improve-reproducibility-for-stabs-debugging-data.patch @@ -0,0 +1,32 @@ +From 96882eb9263b6b1c953e33a6764a83f4a87a9a41 Mon Sep 17 00:00:00 2001 +From: Denys Zagorui +Date: Mon, 9 Nov 2020 15:39:10 +0000 +Subject: [PATCH] gas: improve reproducibility for stabs debugging data format + + * config/obj-elf (obj_elf_init_stab_section): Improve + reproducibility for stabs debugging data format + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0541201782c006c09d029d18a45c6e743cfea906] +--- + gas/config/obj-elf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c +index 7cf921c051..92b55e06c2 100644 +--- a/gas/config/obj-elf.c ++++ b/gas/config/obj-elf.c +@@ -2186,12 +2186,13 @@ obj_elf_init_stab_section (segT seg) + p = frag_more (12); + /* Zero it out. */ + memset (p, 0, 12); +- file = as_where (NULL); ++ file = remap_debug_filename (as_where (NULL)); + stabstr_name = concat (segment_name (seg), "str", (char *) NULL); + stroff = get_stab_string_offset (file, stabstr_name, TRUE); + know (stroff == 1 || (stroff == 0 && file[0] == '\0')); + md_number_to_chars (p, stroff, 4); + seg_info (seg)->stabu.p = p; ++ xfree ((char *) file); + } + + #endif -- cgit v1.2.3-54-g00ecf