* ld.h (flag_is_*): Removed macros.

	* ldmain.c (enter_global_ref), ldsym.c (write_file_locals):
	Consistently check the BFD symbol flags directly, rather than
	using file_is_* macros.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8173dc2545e80d52509b6cd823edf8a01b22ac7f..80d3d44ee007e3e6beed9006cd2e1709aa61c1a2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 29 14:55:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+       * ld.h (flag_is_*): Removed macros.
+       * ldmain.c (enter_global_ref), ldsym.c (write_file_locals):
+       Consistently check the BFD symbol flags directly, rather than
+       using file_is_* macros.
+
 Thu Oct 28 19:08:42 1993  Stan Shebs  (shebs@rtl.cygnus.com)
 
        * configure.in (sparc*-*-lynxos*): New target.

diff --git a/ld/ldsym.c b/ld/ldsym.c
index 6b2a3a75fced92a2261e17839ed059ca84e89208..a948e9ea90e0cbab3342f1ca36a708b7707943b7 100644 (file)
--- a/ld/ldsym.c
+++ b/ld/ldsym.c
@@ -474,14 +474,14 @@ write_file_locals (output_buffer)
 
        if (p->section == 0)
          p->section = &bfd_abs_section;
-       if (flag_is_global (p->flags)
-           || flag_is_weak (p->flags))
+       if ((p->flags & BSF_GLOBAL)
+           || (p->flags & BSF_WEAK))
          {
            /* If this symbol is marked as occurring now, rather than
               at the end, output it now.  This is used for COFF C_EXT
               FCN symbols.  FIXME: There must be a better way.  */
            if (bfd_asymbol_bfd (p) == entry->the_bfd
-               && flag_is_not_at_end (p->flags))
+               && (p->flags & BSF_NOT_AT_END))
              {
                *(output_buffer++) = p;
                p->flags |= BSF_KEEP;
@@ -493,7 +493,7 @@ write_file_locals (output_buffer)
              {
                /* Dont think about indirect symbols */
              }
-           else if (flag_is_debugger (p->flags))
+           else if (p->flags & BSF_DEBUGGING)
              {
                /* Only keep the debugger symbols if no stripping required */
                if (strip_symbols == STRIP_NONE)
@@ -506,7 +506,7 @@ write_file_locals (output_buffer)
              {
                /* These must be global.  */
              }
-           else if (flag_is_ordinary_local (p->flags))
+           else if (p->flags & BSF_LOCAL)
              {
                if (discard_locals == DISCARD_ALL)
                  {