From 93df4ec5fe93fa56de40731ca0021bd5700f5a80 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Fri, 17 Dec 1993 05:21:33 +0000
Subject: [PATCH]         * ldmain.c (lprefix): Change default from a char to a
 string         with only one character.         (lprefix_len): Set default to
 one.

        * ldmain.h (lprefix_len): Declare.

        * ldsym.c (write_file_locals): Use strncmp rather than a character
        comparison for lprefix.

        * emultmpl/m88kbcs.em (before_parse): Set lprefix and lprefix_len
        correctly.

        * emultmpl/hppaosf.em: Include ldexp.h.
        (before_parse): Set lprefix and lprefix_len correctly.
---
 ld/emultempl/hppaosf.em | 6 ++++++
 ld/emultempl/m88kbcs.em | 5 +++--
 ld/ldsym.c              | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ld/emultempl/hppaosf.em b/ld/emultempl/hppaosf.em
index 3bbb9452b7..0bd2318449 100644
--- a/ld/emultempl/hppaosf.em
+++ b/ld/emultempl/hppaosf.em
@@ -29,6 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "config.h"
 #include "ldemul.h"
 #include "ldfile.h"
+#include "ldexp.h"
 #include "ldlang.h"
 #include "ldmisc.h"
 
@@ -43,6 +44,11 @@ extern bfd *output_bfd;
 
 static void hppaosf_before_parse()
 {
+  extern char *lprefix;
+  extern unsigned int lprefix_len;
+  lprefix = "L$";
+  lprefix_len = 2;
+
   ldfile_output_architecture = bfd_arch_hppa;
 }
 
diff --git a/ld/emultempl/m88kbcs.em b/ld/emultempl/m88kbcs.em
index a1add23b58..77b726fb13 100644
--- a/ld/emultempl/m88kbcs.em
+++ b/ld/emultempl/m88kbcs.em
@@ -42,8 +42,9 @@ extern char *ldfile_output_machine_name;
 static void
 gld${EMULATION_NAME}_before_parse()
 {
-  extern char lprefix;
-  lprefix = '@';
+  extern char *lprefix;
+  lprefix = "@";
+  lprefix_len = 1;
 
   ldfile_output_architecture = bfd_arch_${ARCH};
 }
diff --git a/ld/ldsym.c b/ld/ldsym.c
index 74f7956733..6de790d95f 100644
--- a/ld/ldsym.c
+++ b/ld/ldsym.c
@@ -512,7 +512,7 @@ write_file_locals (output_buffer)
 		  {
 		  }
 		else if (discard_locals == DISCARD_L &&
-			 (p->name[0] == lprefix))
+			!strncmp (lprefix, p->name, lprefix_len))
 		  {
 		  }
 		else if (p->flags == BSF_WARNING)
-- 
2.34.1