View | Details | Raw Unified | Return to bug 20308
Collapse All | Expand All

(-)a/gold/i386.cc (-2 / +5 lines)
Lines 2794-2801 Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, Link Here
2794
	   && r_type != elfcpp::R_386_PC32)
2794
	   && r_type != elfcpp::R_386_PC32)
2795
	  || gsym == NULL
2795
	  || gsym == NULL
2796
	  || strcmp(gsym->name(), "___tls_get_addr") != 0)
2796
	  || strcmp(gsym->name(), "___tls_get_addr") != 0)
2797
	gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
2797
	{
2798
			       _("missing expected TLS relocation"));
2798
	  gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
2799
				 _("missing expected TLS relocation"));
2800
	  this->skip_call_tls_get_addr_ = false;
2801
	}
2799
      else
2802
      else
2800
	{
2803
	{
2801
	  this->skip_call_tls_get_addr_ = false;
2804
	  this->skip_call_tls_get_addr_ = false;
(-)a/gold/testsuite/Makefile.am (-2 / +2 lines)
Lines 1298-1307 pr20308b.so: pr20308_def.o gcctestdir/ld Link Here
1298
	$(LINK) -Bgcctestdir/ -shared pr20308_def.o
1298
	$(LINK) -Bgcctestdir/ -shared pr20308_def.o
1299
1299
1300
pr20308_gd.o: pr20308_gd.S
1300
pr20308_gd.o: pr20308_gd.S
1301
	$(COMPILE) -c -o $@ $<
1301
	$(COMPILE) -Bgcctestdir/ -c -o $@ $<
1302
1302
1303
pr20308_ld.o: pr20308_ld.S
1303
pr20308_ld.o: pr20308_ld.S
1304
	$(COMPILE) -c -o $@ $<
1304
	$(COMPILE) -Bgcctestdir/ -c -o $@ $<
1305
1305
1306
endif DEFAULT_TARGET_I386
1306
endif DEFAULT_TARGET_I386
1307
1307
(-)a/gold/testsuite/Makefile.in (-3 / +2 lines)
Lines 6206-6215 uninstall-am: Link Here
6206
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(LINK) -Bgcctestdir/ -shared pr20308_def.o
6206
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(LINK) -Bgcctestdir/ -shared pr20308_def.o
6207
6207
6208
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20308_gd.o: pr20308_gd.S
6208
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20308_gd.o: pr20308_gd.S
6209
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(COMPILE) -c -o $@ $<
6209
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(COMPILE) -Bgcctestdir/ -c -o $@ $<
6210
6210
6211
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20308_ld.o: pr20308_ld.S
6211
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20308_ld.o: pr20308_ld.S
6212
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(COMPILE) -c -o $@ $<
6212
@DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(COMPILE) -Bgcctestdir/ -c -o $@ $<
6213
@GCC_TRUE@@NATIVE_LINKER_TRUE@many_sections_define.h:
6213
@GCC_TRUE@@NATIVE_LINKER_TRUE@many_sections_define.h:
6214
@GCC_TRUE@@NATIVE_LINKER_TRUE@	(for i in `seq 1 70000`; do \
6214
@GCC_TRUE@@NATIVE_LINKER_TRUE@	(for i in `seq 1 70000`; do \
6215
@GCC_TRUE@@NATIVE_LINKER_TRUE@	   echo "int var_$$i __attribute__((section(\"section_$$i\"))) = $$i;"; \
6215
@GCC_TRUE@@NATIVE_LINKER_TRUE@	   echo "int var_$$i __attribute__((section(\"section_$$i\"))) = $$i;"; \
6216
- 

Return to bug 20308