From 1977bc9d4a7414d0e7e0635379857093da2f352e Mon Sep 17 00:00:00 2001
From: Brad Parker <bparker06@users.noreply.github.com>
Date: Mon, 29 Jul 2019 13:38:44 -0400
Subject: [PATCH] add NEED_GOLD_LINKER Makefile option, cdrom: increment count
 for extra fields to avoid "no entries" if system is not detected

---
 Makefile                |  5 +++++
 menu/menu_displaylist.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/Makefile b/Makefile
index 0438eba7c5..cd67bd9ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 HAVE_FILE_LOGGER=1
 NEED_CXX_LINKER=0
+NEED_GOLD_LINKER=0
 MISSING_DECLS   =0
 
 ifneq ($(C90_BUILD),)
@@ -24,6 +25,10 @@ DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
 
 OBJDIR_BASE := obj-unix
 
+ifeq ($(NEED_GOLD_LINKER), 1)
+   LDFLAGS += -fuse-ld=gold
+endif
+
 ifeq ($(DEBUG), 1)
    OBJDIR := $(OBJDIR_BASE)/debug
    CFLAGS ?= -O0 -g
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index bb48a4d6e5..908c5fb2c3 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5118,6 +5118,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   {
                      char atip_string[32] = {"Genuine Disc: "};
 
+                     count++;
+
                      if (atip)
                         strlcat(atip_string, "No", sizeof(atip_string));
                      else
@@ -5133,6 +5135,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   {
                      char tracks_string[32] = {"Number of tracks: "};
 
+                     count++;
+
                      snprintf(tracks_string + strlen(tracks_string), sizeof(tracks_string) - strlen(tracks_string), "%d", toc->num_tracks);
 
                      menu_entries_append_enum(info->list,
@@ -5154,6 +5158,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 
                         snprintf(track_string + strlen(track_string), sizeof(track_string) - strlen(track_string), "%d:", i + 1);
 
+                        count++;
+
                         menu_entries_append_enum(info->list,
                               track_string,
                               "",
@@ -5165,6 +5171,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         else
                            snprintf(mode_string + strlen(mode_string), sizeof(mode_string) - strlen(mode_string), "Mode %d", toc->track[i].mode);
 
+                        count++;
+
                         menu_entries_append_enum(info->list,
                               mode_string,
                               "",
@@ -5173,6 +5181,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 
                         snprintf(size_string + strlen(size_string), sizeof(size_string) - strlen(size_string), "%.1f MB", toc->track[i].track_bytes / 1000.0 / 1000.0);
 
+                        count++;
+
                         menu_entries_append_enum(info->list,
                               size_string,
                               "",
@@ -5188,6 +5198,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
 
                            snprintf(length_string + strlen(length_string), sizeof(length_string) - strlen(length_string), "%02d:%02d.%02d", min, sec, frame);
 
+                           count++;
+
                            menu_entries_append_enum(info->list,
                                  length_string,
                                  "",