diff --git a/gold/ChangeLog b/gold/ChangeLog
index 7bc3893f34..97044b6f72 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/odr_violation2.cc (Ordering::operator()): Make
+	expression even more complex.
+
 2020-05-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ver_test_pr16504.sh: Updated.
diff --git a/gold/testsuite/odr_violation2.cc b/gold/testsuite/odr_violation2.cc
index aa9868fc27..35dd454704 100644
--- a/gold/testsuite/odr_violation2.cc
+++ b/gold/testsuite/odr_violation2.cc
@@ -12,7 +12,7 @@ class Ordering {
 bool Ordering::operator()(int a, int b) {
   // Optimization makes this operator() a different size than the one
   // in odr_violation1.cc.
-  return a + 12345 > b / 67;
+  return (a * 30 + b + 12345) > b / 67;
 }
 
 void SortDescending(int array[], int size) {