PR gold/12572

	* testsuite/odr_violation2.cc: Add comment to make all error line
	numbers double digits.
	* testsuite/debug_msg.sh: Adjust expected errors.

1 files changed, 5 insertions, 2 deletions

diff --git a/gold/testsuite/odr_violation2.cc b/gold/testsuite/odr_violation2.cc
index 6c57b6f..a159182 100644
--- a/gold/testsuite/odr_violation2.cc
+++ b/gold/testsuite/odr_violation2.cc
@@ -6,11 +6,14 @@ class Ordering {
   bool operator()(int a, int b) __attribute__((never_inline));
 };
 
+// This comment makes the line numbers in Ordering::operator() all have
+// two digits, which causes gold's output to be independent of which
+// instruction the compiler optimizes into the front of the function.
 bool Ordering::operator()(int a, int b) {
   // Optimization makes this operator() a different size than the one
   // in odr_violation1.cc.
-    return a + 1 > b + 1;
-  }
+  return a + 1 > b + 1;
+}
 
 void SortDescending(int array[], int size) {
   std::sort(array, array + size, Ordering());