numerically sort the symbols, so that the testcase result is uniform

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167872 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Object/coff-archive.test b/test/Object/coff-archive.test
index 60f7a703c46b02758eb43c39055002d785a36c28..768fe1c4b12922b962e926d4834fb7c3670058f0 100644 (file)
--- a/test/Object/coff-archive.test
+++ b/test/Object/coff-archive.test
@@ -1,7 +1,7 @@
 #
 # Check if the index is appearing properly in the output file 
 #
-RUN: llvm-nm -s %p/Inputs/coff_archive.lib | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm --numeric-sort -s %p/Inputs/coff_archive.lib | FileCheck -check-prefix=CHECKIDX %s
 
 CHECKIDX: Archive map
 CHECKIDX: ??0invalid_argument@std@@QAE@PBD@Z in Debug\mymath.obj
@@ -64,8 +64,8 @@ CHECKIDX: Debug\stdafx.obj:
 CHECKIDX: 00000000 N .debug$S
 CHECKIDX: 00000000 N .debug$T
 CHECKIDX: 00000000 i .drectve
-CHECKIDX: 00ab9d1b a @comp.id
 CHECKIDX: 00000001 a @feat.00
+CHECKIDX: 00ab9d1b a @comp.id
 CHECKIDX: Debug\mymath.obj:
 CHECKIDX: 00000000 d .data
 CHECKIDX: 00000000 d .data
@@ -145,18 +145,9 @@ CHECKIDX: 00000000 T ??0invalid_argument@std@@QAE@PBD@Z
 CHECKIDX: 00000000 T ??0logic_error@std@@QAE@PBD@Z
 CHECKIDX: 00000000 T ??1invalid_argument@std@@UAE@XZ
 CHECKIDX: 00000000 T ??1logic_error@std@@UAE@XZ
-CHECKIDX:          U ??2@YAPAXI@Z
-CHECKIDX:          U ??3@YAXPAX@Z
-CHECKIDX: 00000004 R ??_7invalid_argument@std@@6B@
-CHECKIDX: 00000004 R ??_7logic_error@std@@6B@
-CHECKIDX:          U ??_7type_info@@6B@
 CHECKIDX: 00000000 R ??_C@_0BC@IHENMCGI@b?5cannot?5be?5zero?$CB?$AA@
-CHECKIDX:          w ??_Einvalid_argument@std@@UAEPAXI@Z
-CHECKIDX:          w ??_Elogic_error@std@@UAEPAXI@Z
 CHECKIDX: 00000000 T ??_Ginvalid_argument@std@@UAEPAXI@Z
-CHECKIDX:          U ??_Ginvalid_argument@std@@UAEPAXI@Z
 CHECKIDX: 00000000 T ??_Glogic_error@std@@UAEPAXI@Z
-CHECKIDX:          U ??_Glogic_error@std@@UAEPAXI@Z
 CHECKIDX: 00000000 D ??_R0?AVexception@std@@@8
 CHECKIDX: 00000000 D ??_R0?AVinvalid_argument@std@@@8
 CHECKIDX: 00000000 D ??_R0?AVlogic_error@std@@@8
@@ -197,29 +188,38 @@ CHECKIDX: 00000000 R ?_Rank@?$_Arithmetic_traits@_N@std@@2HB
 CHECKIDX: 00000000 R ?value@?$integral_constant@I$0A@@tr1@std@@2IB
 CHECKIDX: 00000000 R ?value@?$integral_constant@_N$00@tr1@std@@2_NB
 CHECKIDX: 00000000 R ?value@?$integral_constant@_N$0A@@tr1@std@@2_NB
-CHECKIDX:          U ?what@exception@std@@UBEPBDXZ
-CHECKIDX:          U @__security_check_cookie@4
-CHECKIDX: 00ab9d1b a @comp.id
-CHECKIDX: 00000001 a @feat.00
 CHECKIDX: 00000000 R __CT??_R0PAVexception@std@@@84
 CHECKIDX: 00000000 R __CT??_R0PAVinvalid_argument@std@@@84
 CHECKIDX: 00000000 R __CT??_R0PAVlogic_error@std@@@84
 CHECKIDX: 00000000 R __CT??_R0PAX@84
 CHECKIDX: 00000000 R __CTA4PAVinvalid_argument@std@@
+CHECKIDX: 00000000 r __RTC_InitBase.rtc$IMZ
+CHECKIDX: 00000000 r __RTC_Shutdown.rtc$TMZ
+CHECKIDX: 00000000 R __TI4PAVinvalid_argument@std@@
+CHECKIDX: 00000000 R __real@0000000000000000
+CHECKIDX: 00000000 t __unwindfunclet$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z$0
+CHECKIDX: 00000000 r __unwindtable$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00000001 a @feat.00
+CHECKIDX: 00000004 R ??_7invalid_argument@std@@6B@
+CHECKIDX: 00000004 R ??_7logic_error@std@@6B@
+CHECKIDX: 00000008 r __ehfuncinfo$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 0000000e t __ehhandler$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
+CHECKIDX: 00ab9d1b a @comp.id
+CHECKIDX:          U ??2@YAPAXI@Z
+CHECKIDX:          U ??3@YAXPAX@Z
+CHECKIDX:          U ??_7type_info@@6B@
+CHECKIDX:          w ??_Einvalid_argument@std@@UAEPAXI@Z
+CHECKIDX:          w ??_Elogic_error@std@@UAEPAXI@Z
+CHECKIDX:          U ??_Ginvalid_argument@std@@UAEPAXI@Z
+CHECKIDX:          U ??_Glogic_error@std@@UAEPAXI@Z
+CHECKIDX:          U ?what@exception@std@@UBEPBDXZ
+CHECKIDX:          U @__security_check_cookie@4
 CHECKIDX:          U __CxxThrowException@8
 CHECKIDX:          U __RTC_CheckEsp
 CHECKIDX:          U __RTC_InitBase
-CHECKIDX: 00000000 r __RTC_InitBase.rtc$IMZ
 CHECKIDX:          U __RTC_Shutdown
-CHECKIDX: 00000000 r __RTC_Shutdown.rtc$TMZ
-CHECKIDX: 00000000 R __TI4PAVinvalid_argument@std@@
 CHECKIDX:          U ___CxxFrameHandler3
 CHECKIDX:          U ___security_cookie
-CHECKIDX: 00000008 r __ehfuncinfo$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
-CHECKIDX: 0000000e t __ehhandler$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z
 CHECKIDX:          U __fltused
 CHECKIDX:          U __imp_??0exception@std@@QAE@ABQBD@Z
 CHECKIDX:          U __imp_??1exception@std@@UAE@XZ
-CHECKIDX: 00000000 R __real@0000000000000000
-CHECKIDX: 00000000 t __unwindfunclet$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z$0
-CHECKIDX: 00000000 r __unwindtable$?Divide@MyMathFuncs@MathFuncs@@SANNN@Z