Merge changes between r13758 and r13800 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@13801 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 17 insertions, 0 deletions

diff --git a/libc/elf/tst-unique4lib.cc b/libc/elf/tst-unique4lib.cc
new file mode 100644
index 000000000..c9fdf9cfe
--- /dev/null
+++ b/libc/elf/tst-unique4lib.cc
@@ -0,0 +1,17 @@
+// BZ 12511
+#include "tst-unique4.h"
+
+template<int N>
+int S<N>::i = N;
+template<int N>
+const int S<N>::j __attribute__ ((used)) = -1;
+
+static int a[24] =
+  {
+    S<1>::i, S<2>::i, S<3>::i, S<4>::i, S<5>::i, S<6>::i, S<7>::i, S<8>::i,
+    S<9>::i, S<10>::i, S<11>::i, S<12>::i, S<13>::i, S<14>::i, S<15>::i,
+    S<16>::i, S<17>::i, S<18>::i, S<19>::i, S<20>::i, S<21>::i, S<22>::i,
+    S<23>::i, S<24>::i
+  };
+
+static int b = S<1>::j;