From 351039f21a3896a937eef2ca87c3e49e8a7a02ce Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 16 Feb 2016 04:14:54 -0500 Subject: gcc-4.9/5.3: Ignore -fdebug-prefix-map in producer string Backport from upstream master. The discussion detail: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69821 Compile without this fix: objdump -g packages-split/lib32-glibc-dev/usr/lib/gcrt1.o ... | <5f> DW_AT_producer : (indirect string, offset: 0x1b): GNU C99 5.3.0 -m32-march=core2 -mtune=core2 -msse3 -mfpmath=sse -mpreferred-stack-boundary=4 -g -O2 -std=gnu99 -fgnu89-inline -fdebug-prefix-map=/buildarea/raid0/hjia/buil d-20160127-yocto-buildpath-2/tmp/sysroots/lib32-qemux86-64= -feliminate-unused-debug-types -fmerge-all-constants -frounding-math -ftls-model=initial-exec ... Compile with this fix: objdump -g packages-split/lib32-glibc-dev/usr/lib/gcrt1.o ... | <5f> DW_AT_producer : (indirect string, offset: 0xa1): GNU C99 5.3.0 -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mpreferred-stack-boundary=4 -g -O2 -std=gnu99 -fgnu89-inline -feliminate-unused-debug-types -fmerge-all-constants -frounding-math -ftls-model=initial-exec ... [YOCTO #7058] (From OE-Core rev: a0d444a2e3e1b6b095f30b7fe1c9cfd8bce5a845) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + ...ug-prefix-map-in-producer-string-by-Danie.patch | 31 ++++++++++++++++++++++ meta/recipes-devtools/gcc/gcc-5.3.inc | 1 + ...ug-prefix-map-in-producer-string-by-Danie.patch | 31 ++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0071-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.3/0051-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch (limited to 'meta/recipes-devtools/gcc') diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 736c95689a..641249037e 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -86,6 +86,7 @@ SRC_URI = "\ file://0068-musl-dynamic-linker.patch \ file://0069-musl-no-fixincludes.patch \ file://0070-libstdc-musl.patch \ + file://0071-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch \ " SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0071-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch b/meta/recipes-devtools/gcc/gcc-4.9/0071-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch new file mode 100644 index 0000000000..e8f79b590a --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0071-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch @@ -0,0 +1,31 @@ +From 32593b38082ea65f4c82159254adf1e0dc2423be Mon Sep 17 00:00:00 2001 +From: bernds +Date: Tue, 16 Feb 2016 03:15:15 -0500 +Subject: [PATCH] Ignore -fdebug-prefix-map in producer string (by Daniel Kahn + Gillmor) + +* dwarf2out.c (gen_producer_string): Ignore -fdebug-prefix-map. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231835 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia +--- + gcc/dwarf2out.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c +index 3614c10..526f114 100644 +--- a/gcc/dwarf2out.c ++++ b/gcc/dwarf2out.c +@@ -19670,6 +19670,7 @@ gen_producer_string (void) + case OPT_fpreprocessed: + case OPT_fltrans_output_list_: + case OPT_fresolution_: ++ case OPT_fdebug_prefix_map_: + /* Ignore these. */ + continue; + default: +-- +1.9.1 + diff --git a/meta/recipes-devtools/gcc/gcc-5.3.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc index 214af10c51..a653e5c4ff 100644 --- a/meta/recipes-devtools/gcc/gcc-5.3.inc +++ b/meta/recipes-devtools/gcc/gcc-5.3.inc @@ -80,6 +80,7 @@ SRC_URI = "\ file://0048-ssp_nonshared.patch \ file://0049-Disable-the-weak-reference-logic-in-gthr.h-for-os-ge.patch \ file://0050-powerpc-pass-secure-plt-to-the-linker.patch \ + file://0051-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch \ " BACKPORTS = "" diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0051-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch b/meta/recipes-devtools/gcc/gcc-5.3/0051-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch new file mode 100644 index 0000000000..e8f79b590a --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-5.3/0051-Ignore-fdebug-prefix-map-in-producer-string-by-Danie.patch @@ -0,0 +1,31 @@ +From 32593b38082ea65f4c82159254adf1e0dc2423be Mon Sep 17 00:00:00 2001 +From: bernds +Date: Tue, 16 Feb 2016 03:15:15 -0500 +Subject: [PATCH] Ignore -fdebug-prefix-map in producer string (by Daniel Kahn + Gillmor) + +* dwarf2out.c (gen_producer_string): Ignore -fdebug-prefix-map. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231835 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Hongxu Jia +--- + gcc/dwarf2out.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c +index 3614c10..526f114 100644 +--- a/gcc/dwarf2out.c ++++ b/gcc/dwarf2out.c +@@ -19670,6 +19670,7 @@ gen_producer_string (void) + case OPT_fpreprocessed: + case OPT_fltrans_output_list_: + case OPT_fresolution_: ++ case OPT_fdebug_prefix_map_: + /* Ignore these. */ + continue; + default: +-- +1.9.1 + -- cgit v1.2.3-54-g00ecf