diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 013fbebe73746a2d8643811da3177ad947edbabe..2edc17decd66652377adebb6b84901c8c8c16e68 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-22  Alan Modra  <amodra@gmail.com>
+
+	* ld-powerpc/tocopt4a.s, * ld-powerpc/tocopt4b.s,
+	* ld-powerpc/tocopt4.d: New test.
+	* ld-powerpc/powerpc.exp: Run it.
+
 2011-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/13082
diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
index d48b1488906155e663b5d40add819ad8cbb7c28b..5ec36b29cd7e09cc850a174155350eb7954eae65 100644
--- a/ld/testsuite/ld-powerpc/powerpc.exp
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
@@ -209,6 +209,8 @@ set ppc64elftests {
 	{{ld tocopt2.out} {objdump -s tocopt2.d}} "tocopt2"}
     {"TOC opt3" "-melf64ppc -no-keep-memory --defsym x=2" "-a64"  {tocopt3.s}
 	{{objdump -s tocopt3.d}} "tocopt3"}
+    {"TOC opt4" "-melf64ppc -no-keep-memory --defsym x=2" "-a64"
+        {tocopt4a.s tocopt4b.s} {{objdump -s tocopt4.d}} "tocopt4"}
 }
 
 
diff --git a/ld/testsuite/ld-powerpc/tocopt4.d b/ld/testsuite/ld-powerpc/tocopt4.d
new file mode 100644
index 0000000000000000000000000000000000000000..4f450e44a5ac6881cab246f866d95505c7598b93
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/tocopt4.d
@@ -0,0 +1,7 @@
+
+.*:     file format .*
+
+Contents of section \.text:
+ 100000b0 e9298000 .*
+Contents of section \.got:
+ 100100b8 00000000 00000002 .*
diff --git a/ld/testsuite/ld-powerpc/tocopt4a.s b/ld/testsuite/ld-powerpc/tocopt4a.s
new file mode 100644
index 0000000000000000000000000000000000000000..3d6f28e387a73be6fb5544cc6609de94ce98eb92
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/tocopt4a.s
@@ -0,0 +1,4 @@
+ .globl _start
+ .text
+_start:
+ ld 9,xt@toc(9)
diff --git a/ld/testsuite/ld-powerpc/tocopt4b.s b/ld/testsuite/ld-powerpc/tocopt4b.s
new file mode 100644
index 0000000000000000000000000000000000000000..ee77d10bfdc7e7fed0e0a3b0582c6a5b1d7b7823
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/tocopt4b.s
@@ -0,0 +1,17 @@
+ .section .toc,"aw"
+ .globl xt
+xt:
+ .quad x
+#
+# This testcase will fail with a warning "xt defined on removed toc entry"
+# if a large-toc access like the following is added to this file, because
+# toc analysis only considers toc accesses from the current object file.
+# The small-toc access from tocopt4a.s doesn't cause xt entry to be marked
+# !can_optimize.  The testcase only passes because toc analysis considers
+# *no* access from the current file as being sufficiently unusual to
+# warrant keeping the toc entry.  So, if you use global symbols on toc
+# entries, don't mix code models.
+#
+# .text
+# addis 9,2,xt@toc@ha
+# ld 9,xt@toc@l(9)