From e44d0670a69a641b82a0ca50e06e85d807b473ea Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 22 Feb 2022 16:06:52 +0000
Subject: [PATCH] 8244593: Clean up GNM/NM after JEP 381

Reviewed-by: erikj
---
 make/autoconf/compare.sh.in | 2 +-
 make/autoconf/spec.gmk.in   | 1 -
 make/autoconf/toolchain.m4  | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/make/autoconf/compare.sh.in b/make/autoconf/compare.sh.in
index 1c48f800c8a..542a516ebc4 100644
--- a/make/autoconf/compare.sh.in
+++ b/make/autoconf/compare.sh.in
@@ -53,7 +53,7 @@ export LDD="@LDD@"
 export LN="@LN@"
 export MKDIR="@MKDIR@"
 export MV="@MV@"
-export NM="@GNM@"
+export NM="@NM@"
 export OBJDUMP="@OBJDUMP@"
 export OTOOL="@OTOOL@"
 export PRINTF="@PRINTF@"
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index d286d5cc2cc..76f43f5bbd7 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -582,7 +582,6 @@ AR := @AR@
 ARFLAGS:=@ARFLAGS@
 
 NM:=@NM@
-GNM:=@GNM@
 STRIP:=@STRIP@
 OBJDUMP:=@OBJDUMP@
 CXXFILT:=@CXXFILT@
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 5280520b78b..2288dda7ed6 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -772,8 +772,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
     else
       UTIL_LOOKUP_TOOLCHAIN_PROGS(NM, nm)
     fi
-    GNM="$NM"
-    AC_SUBST(GNM)
   fi
 
   # objcopy is used for moving debug symbols to separate files when