Revert this file back to its FSF/Cygnus virgin state.

With jb's rev 1.2 commit to usr.bin/lorder/lorder.sh we don't depend on
the 4.4BSD's ``nm -o'' behavior.

Previous to 4.3BSD-Reno, ``nm -o'' did not output the .o's filename on a
line by itself.  The change occurred between CSRG's nm.c rev 4.8 (1987) and
rev 5.1 (in 1989), which was "new version from Hans Huebner hans@garp.mit.edu,
huebner@db0tui6.BITNET".  The Binutils maintainers would rather cater to
a loud boisterous user of 4.3BSD VAXen which has its own native toolchain,
rather than a modern Unix with multiple orders of magnitude more users
and in which Binutils *is* the native toolchain.

1 files changed, 3 insertions, 1 deletions

diff --git a/contrib/binutils/binutils/nm.c b/contrib/binutils/binutils/nm.c
index d5f7f5c..becdad2 100644
--- a/contrib/binutils/binutils/nm.c
+++ b/contrib/binutils/binutils/nm.c
@@ -17,6 +17,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD$ */
+
 #include "bfd.h"
 #include "progress.h"
 #include "bucomm.h"
@@ -1262,7 +1264,7 @@ static void
 print_object_filename_bsd (filename)
      char *filename;
 {
-  if (filename_per_file)
+  if (filename_per_file && !filename_per_symbol)
     printf ("\n%s:\n", filename);
 }