2010-02-26 Doug Kwan <dougkwan@google.com>

	* arm.cc (Target_arm::Relocate::reloc_is_non_pic): Treat
	R_ARM_PREL31 and R_ARM_SBREL31 as position independent.
	* testsuite/debug_msg.sh: Avoid matching source line number for
	use of global variable undef_int.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 47bd8a791e9a26649386a91f4533179641342941..d6e806d13aad19b123f35e038448a413b386c75a 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-26  Doug Kwan  <dougkwan@google.com>
+
+       * arm.cc (Target_arm::Relocate::reloc_is_non_pic): Treat
+       R_ARM_PREL31 and R_ARM_SBREL31 as position independent.
+       * testsuite/debug_msg.sh: Avoid matching source line number for
+       use of global variable undef_int.
+
 2010-02-26  Doug Kwan  <dougkwan@google.com>
 
        * arm.cc (Target_arm::scan_reloc_for_stub): Move code handling

diff --git a/gold/arm.cc b/gold/arm.cc
index dde2d083c0df3d1f4b706a53041489eb0f220733..bba6e280986efe835fe0c9cf12e1fd2db813ae6c 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -2444,6 +2444,8 @@ class Target_arm : public Sized_target<32, big_endian>
        case elfcpp::R_ARM_THM_JUMP19:
        case elfcpp::R_ARM_PLT32:
        case elfcpp::R_ARM_THM_XPC22:
+       case elfcpp::R_ARM_PREL31:
+       case elfcpp::R_ARM_SBREL31:
          return false;
 
        default:

diff --git a/gold/testsuite/debug_msg.sh b/gold/testsuite/debug_msg.sh
index 9a92482910fa70a7f3156e96737e4e629f7c5350..750261ef0957bf3df34ae8dbd83464c3b7d8eb1b 100755 (executable)
--- a/gold/testsuite/debug_msg.sh
+++ b/gold/testsuite/debug_msg.sh
@@ -66,10 +66,10 @@ check debug_msg.err "debug_msg.o: in function Base::virtfn():.*/debug_msg.cc:50:
 check debug_msg.err "debug_msg.o: in function Derived::virtfn():.*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'"
 check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
 check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:45: error: undefined reference to 'undef_int'"
+check debug_msg.err "debug_msg.o: in function int testfn<int>(int):.*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
 check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:43: error: undefined reference to 'undef_fn1()'"
 check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:44: error: undefined reference to 'undef_fn2()'"
-check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:45: error: undefined reference to 'undef_int'"
+check debug_msg.err "debug_msg.o: in function int testfn<double>(double):.*/debug_msg.cc:.*: error: undefined reference to 'undef_int'"
 
 # Check we detected the ODR (One Definition Rule) violation.
 check debug_msg.err ": symbol 'Ordering::operator()(int, int)' defined in multiple places (possible ODR violation):"