fix Darwin target/81685

2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline
	2018-08-15  Iain Sandoe  <iain@sandoe.co.uk>

	PR target/81685
	* config/darwin.h: (DEBUG_STR_OFFSETS_SECTION, DEBUG_LOCLISTS_SECTION,
	DEBUG_RNGLISTS_SECTION) new macros.  (DEBUG_PUBNAMES_SECTION,
	DEBUG_PUBTYPES_SECTION) update to include GNU variant.

From-SVN: r267401

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80100b28851cfd60c2507d90696cf0170e5c2569..cb5532156ddf2e76e95d84b253952d5aaefe88a5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2018-12-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline
+       2018-08-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+       PR target/81685
+       * config/darwin.h: (DEBUG_STR_OFFSETS_SECTION, DEBUG_LOCLISTS_SECTION,
+       DEBUG_RNGLISTS_SECTION) new macros.  (DEBUG_PUBNAMES_SECTION,
+       DEBUG_PUBTYPES_SECTION) update to include GNU variant.
+
 2018-12-21  Uros Bizjak  <ubizjak@gmail.com>
 
        Backport from mainline

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index fb8634f81c10417afec4cb22737ba2a111ebb64e..6792289d1c84aea5171b13e9bb94f5f6605abae2 100644 (file)
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -434,20 +434,29 @@ extern GTY(()) int darwin_ms_struct;
 
 #define DWARF2_DEBUGGING_INFO 1
 
-#define DEBUG_FRAME_SECTION    "__DWARF,__debug_frame,regular,debug"
-#define DEBUG_INFO_SECTION     "__DWARF,__debug_info,regular,debug"
-#define DEBUG_ABBREV_SECTION   "__DWARF,__debug_abbrev,regular,debug"
-#define DEBUG_ARANGES_SECTION  "__DWARF,__debug_aranges,regular,debug"
-#define DEBUG_MACINFO_SECTION  "__DWARF,__debug_macinfo,regular,debug"
-#define DEBUG_LINE_SECTION     "__DWARF,__debug_line,regular,debug"
-#define DEBUG_LOC_SECTION      "__DWARF,__debug_loc,regular,debug"
-#define DEBUG_PUBNAMES_SECTION "__DWARF,__debug_pubnames,regular,debug"
-#define DEBUG_PUBTYPES_SECTION "__DWARF,__debug_pubtypes,regular,debug"
-#define DEBUG_STR_SECTION      "__DWARF,__debug_str,regular,debug"
-#define DEBUG_RANGES_SECTION   "__DWARF,__debug_ranges,regular,debug"
-#define DEBUG_MACRO_SECTION    "__DWARF,__debug_macro,regular,debug"
+#define DEBUG_FRAME_SECTION      "__DWARF,__debug_frame,regular,debug"
+#define DEBUG_INFO_SECTION       "__DWARF,__debug_info,regular,debug"
+#define DEBUG_ABBREV_SECTION     "__DWARF,__debug_abbrev,regular,debug"
+#define DEBUG_ARANGES_SECTION    "__DWARF,__debug_aranges,regular,debug"
+#define DEBUG_MACINFO_SECTION    "__DWARF,__debug_macinfo,regular,debug"
+#define DEBUG_LINE_SECTION       "__DWARF,__debug_line,regular,debug"
+#define DEBUG_LOC_SECTION        "__DWARF,__debug_loc,regular,debug"
+#define DEBUG_LOCLISTS_SECTION    "__DWARF,__debug_loclists,regular,debug"
+
+#define DEBUG_STR_SECTION        "__DWARF,__debug_str,regular,debug"
+#define DEBUG_STR_OFFSETS_SECTION "__DWARF,__debug_str_offs,regular,debug"
+#define DEBUG_RANGES_SECTION     "__DWARF,__debug_ranges,regular,debug"
+#define DEBUG_RNGLISTS_SECTION    "__DWARF,__debug_rnglists,regular,debug"
+#define DEBUG_MACRO_SECTION       "__DWARF,__debug_macro,regular,debug"
 
 #define TARGET_WANT_DEBUG_PUB_SECTIONS true
+#define DEBUG_PUBNAMES_SECTION   ((debug_generate_pub_sections == 2) \
+                               ? "__DWARF,__debug_gnu_pubn,regular,debug" \
+                               : "__DWARF,__debug_pubnames,regular,debug")
+
+#define DEBUG_PUBTYPES_SECTION   ((debug_generate_pub_sections == 2) \
+                               ? "__DWARF,__debug_gnu_pubt,regular,debug" \
+                               : "__DWARF,__debug_pubtypes,regular,debug")
 
 /* When generating stabs debugging, use N_BINCL entries.  */