From cf6a01774bcc5363b6a2622022695f02c8cef561 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Mon, 28 Sep 2020 01:57:25 -0400
Subject: [PATCH] Remove sbcl.nm make step

Developers can do that on their own; non-developers don't need it.
---
 .gitignore                      |  1 -
 src/runtime/Config.arm-android  |  1 -
 src/runtime/Config.arm-linux    |  1 -
 src/runtime/Config.arm64-linux  |  2 --
 src/runtime/Config.mips-linux   |  1 -
 src/runtime/Config.ppc-linux    |  1 -
 src/runtime/Config.ppc64-linux  |  1 -
 src/runtime/Config.riscv-linux  |  2 --
 src/runtime/Config.sparc-linux  |  1 -
 src/runtime/Config.x86-64-linux |  2 --
 src/runtime/Config.x86-64-sunos |  1 -
 src/runtime/Config.x86-linux    |  2 --
 src/runtime/Config.x86-sunos    |  1 -
 src/runtime/GNUmakefile         | 11 +----------
 src/runtime/linux-nm            |  9 ---------
 15 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100755 src/runtime/linux-nm

diff --git a/.gitignore b/.gitignore
index 2ea1e4263..df659c05c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ src/runtime/sbcl
 src/runtime/sbcl.exe
 src/runtime/sbcl.h
 src/runtime/sbcl.mk
-src/runtime/sbcl.nm
 src/runtime/shrinkwrap-sbcl*
 src/runtime/target-arch-os.h
 src/runtime/target-arch.h
diff --git a/src/runtime/Config.arm-android b/src/runtime/Config.arm-android
index 2854b65f4..ba1cd15f2 100644
--- a/src/runtime/Config.arm-android
+++ b/src/runtime/Config.arm-android
@@ -12,7 +12,6 @@
 CC=${NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/arm-linux-androideabi/bin/gcc
 CFLAGS += -marm -march=armv5 --sysroot=${NDK_PATH}/platforms/android-15/arch-arm/
 LINKFLAGS += --sysroot=${NDK_PATH}/platforms/android-15/arch-arm/
-NM = ${NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/arm-linux-androideabi/bin/nm
 
 ASSEM_SRC = arm-assem.S
 ARCH_SRC = arm-arch.c
diff --git a/src/runtime/Config.arm-linux b/src/runtime/Config.arm-linux
index 2f72b244e..cc9b62861 100644
--- a/src/runtime/Config.arm-linux
+++ b/src/runtime/Config.arm-linux
@@ -10,7 +10,6 @@
 # files for more information.
 
 CFLAGS += -marm -march=armv5
-NM = ./linux-nm
 
 ASSEM_SRC = arm-assem.S
 ARCH_SRC = arm-arch.c
diff --git a/src/runtime/Config.arm64-linux b/src/runtime/Config.arm64-linux
index 467245941..a073f6844 100644
--- a/src/runtime/Config.arm64-linux
+++ b/src/runtime/Config.arm64-linux
@@ -9,8 +9,6 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-NM = ./linux-nm
-
 ASSEM_SRC = arm64-assem.S
 ARCH_SRC = arm64-arch.c
 
diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux
index 7ec674f4b..b52fd4817 100644
--- a/src/runtime/Config.mips-linux
+++ b/src/runtime/Config.mips-linux
@@ -10,7 +10,6 @@
 # files for more information.
 
 LINKFLAGS += -O2 -Wl,--export-dynamic
-NM = ./linux-nm
 
 ASSEM_SRC = mips-assem.S
 ARCH_SRC = mips-arch.c
diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux
index 2f3ce9f63..d284522ec 100644
--- a/src/runtime/Config.ppc-linux
+++ b/src/runtime/Config.ppc-linux
@@ -11,7 +11,6 @@
 
 CFLAGS += -m32
 LINKFLAGS += -m32 -Wl,--export-dynamic
-NM = ./linux-nm
 
 ASSEM_SRC = ppc-assem.S
 ARCH_SRC = ppc-arch.c
diff --git a/src/runtime/Config.ppc64-linux b/src/runtime/Config.ppc64-linux
index e58cb5d5c..56d480737 100644
--- a/src/runtime/Config.ppc64-linux
+++ b/src/runtime/Config.ppc64-linux
@@ -11,7 +11,6 @@
 
 CFLAGS += -m64
 LINKFLAGS += -m64 -Wl,--export-dynamic
-NM = ./linux-nm
 
 ASSEM_SRC = ppc64-assem.S
 ARCH_SRC = ppc-arch.c
diff --git a/src/runtime/Config.riscv-linux b/src/runtime/Config.riscv-linux
index 3e49bc2ee..ebb62aaa9 100644
--- a/src/runtime/Config.riscv-linux
+++ b/src/runtime/Config.riscv-linux
@@ -9,8 +9,6 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-NM = ./linux-nm
-
 ARCH_SRC = riscv-arch.c
 
 OS_SRC = linux-os.c linux-mman.c riscv-linux-os.c
diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux
index 8b7ab0d44..575aeb77d 100644
--- a/src/runtime/Config.sparc-linux
+++ b/src/runtime/Config.sparc-linux
@@ -12,7 +12,6 @@
 CFLAGS += -m32 -fno-PIC
 ASFLAGS = -m32 -fno-PIC -g -Wall -Wa,-xarch=v8plus
 LINKFLAGS += -rdynamic -m32
-NM = ./linux-nm
 
 ASSEM_SRC = sparc-assem.S
 ARCH_SRC = sparc-arch.c
diff --git a/src/runtime/Config.x86-64-linux b/src/runtime/Config.x86-64-linux
index a638b9ede..ccea25688 100644
--- a/src/runtime/Config.x86-64-linux
+++ b/src/runtime/Config.x86-64-linux
@@ -9,8 +9,6 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-NM = ./linux-nm
-
 ASSEM_SRC = x86-64-assem.S
 ARCH_SRC = x86-64-arch.c
 OS_SRC = linux-os.c linux-mman.c x86-64-linux-os.c
diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos
index 17eef040f..bf0bad5f4 100644
--- a/src/runtime/Config.x86-64-sunos
+++ b/src/runtime/Config.x86-64-sunos
@@ -2,7 +2,6 @@ CC=gcc
 CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
 LINKFLAGS = -m64 -g
 ASFLAGS = -m64 -Wall
-NM = nm -xgp
 GREP = ggrep
 
 #CC=/opt/SunStudioExpress/bin/cc
diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux
index 6a8f83614..28798b427 100644
--- a/src/runtime/Config.x86-linux
+++ b/src/runtime/Config.x86-linux
@@ -9,8 +9,6 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-NM = ./linux-nm
-
 ASSEM_SRC = x86-assem.S
 ARCH_SRC = x86-arch.c
 OS_SRC = linux-os.c linux-mman.c x86-linux-os.c
diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos
index c63fa6676..740b9be60 100644
--- a/src/runtime/Config.x86-sunos
+++ b/src/runtime/Config.x86-sunos
@@ -11,7 +11,6 @@
 
 CC=gcc
 CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
-NM = nm -xgp
 GREP = ggrep
 
 ASSEM_SRC = x86-assem.S
diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile
index 281fe1bd5..a44ccf86b 100644
--- a/src/runtime/GNUmakefile
+++ b/src/runtime/GNUmakefile
@@ -22,7 +22,6 @@ SBCL_PAXCTL ?= :
 # Config file. Most of them are same on most systems right now.
 # If you need to override one of these, do it in Config.
 LINKFLAGS += -g
-NM = nm -gp
 DEPEND_FLAGS = -MM
 GREP = grep
 LD = ld
@@ -69,11 +68,7 @@ OBJS = $(C_SRC:.c=.o) $(ASSEM_SRC:.S=.o)
 
 LIBS = ${OS_LIBS} -lm
 
-ifdef LISP_FEATURE_SUNOS # don't bother running 'nm' (or 'gnm')
 targets: $(TARGET) $(OBJTARGET) sbcl.mk
-else
-targets: $(TARGET) $(OBJTARGET) sbcl.nm sbcl.mk
-endif
 
 $(TARGET): $(LIBSBCL)
 	$(CC) ${LINKFLAGS} -o $@ $(USE_LIBSBCL) $(LIBS)
@@ -141,10 +136,6 @@ sbcl.mk: Config
 	  fi ; \
 	  : ) > $@
 
-sbcl.nm: $(TARGET)
-	$(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@
-	mv -f ,$@ $@
-
 sbcl.h: $(wildcard genesis/*.h)
 	echo '#include "genesis/config.h"' >sbcl.h
 	echo '#include "genesis/constants.h"' >>sbcl.h
@@ -156,7 +147,7 @@ TAGS tags: $(SRCS) $(HEADERS)
 	@etags $(SRCS) $(HEADERS) || true
 
 clean:
-	-rm -f *.[do] $(TARGET) sbcl.nm sbcl.h core *.tmp $(OS_CLEAN_FILES) libsbcl.a shrinkwrap-sbcl* sbcl.mk
+	-rm -f *.[do] $(TARGET) sbcl.h core *.tmp $(OS_CLEAN_FILES) libsbcl.a shrinkwrap-sbcl* sbcl.mk
 
 %.d: %.c sbcl.h
 	@$(CC) $(DEPEND_FLAGS) $(CPPFLAGS) $< > $@.tmp; \
diff --git a/src/runtime/linux-nm b/src/runtime/linux-nm
deleted file mode 100755
index 65a870bac..000000000
--- a/src/runtime/linux-nm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# " A " used to be in the set of removed symbols, but it turns out
-# that the alpha implementation of closure_tramp and undefined_tramp
-# is as an A.  Whatever that is.  CSR, 2005-06-12.
-# " A " is a global absolute symbol, that is a symbol with a fixed
-# assembly time value (which is used for offset calculations).
-
-nm -p "$@" | GREP_OPTIONS='' grep -v " [abcdgIiNnrstUuvw?-] "