# HG changeset patch
# User dlong
# Date 1422070764 18000
# Node ID 7dc31f3b4939f34d5f0db1312d5510a7fb5b626c
# Parent  b228beabcf1f7a3d3cc607de285cdcd88da86e1f
8031064: build_vm_def.sh not working correctly for new build cross compile
Summary: move nm and awk code into vm.make
Reviewed-by: dsamersoff, dholmes

diff -r b228beabcf1f -r 7dc31f3b4939 hotspot/make/linux/makefiles/build_vm_def.sh
--- a/hotspot/make/linux/makefiles/build_vm_def.sh	Thu Jan 22 21:02:24 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# If we're cross compiling use that path for nm
-if [ "$CROSS_COMPILE_ARCH" != "" ]; then 
-NM=$ALT_COMPILER_PATH/nm
-else
-NM=nm
-fi
-
-$NM --defined-only $* \
-    | awk '{
-              if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
-              if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
-              if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
-          }' \
-    | sort -u
diff -r b228beabcf1f -r 7dc31f3b4939 hotspot/make/linux/makefiles/vm.make
--- a/hotspot/make/linux/makefiles/vm.make	Thu Jan 22 21:02:24 2015 +0000
+++ b/hotspot/make/linux/makefiles/vm.make	Fri Jan 23 22:39:24 2015 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -239,8 +239,14 @@
 	rm -f $@
 	cat $^ > $@
 
+VMDEF_PAT  = ^_ZTV
+VMDEF_PAT := ^gHotSpotVM|$(VMDEF_PAT)
+VMDEF_PAT := ^UseSharedSpaces$$|$(VMDEF_PAT)
+VMDEF_PAT := ^_ZN9Arguments17SharedArchivePathE$$|$(VMDEF_PAT)
+
 vm.def: $(Res_Files) $(Obj_Files)
-	sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
+	$(QUIETLY) $(NM) --defined-only $(Obj_Files) | sort -k3 -u | \
+	awk '$$3 ~ /$(VMDEF_PAT)/ { print "\t" $$3 ";" }' > $@
 
 mapfile_ext:
 	rm -f $@