[libgo] Support 32-bit SPARC relocs

Message ID yddwp54rrza.fsf@CeBiTec.Uni-Bielefeld.DE
State New
Headers show
Series
  • [libgo] Support 32-bit SPARC relocs
Related show

Commit Message

Rainer Orth Sept. 12, 2017, 1:01 p.m.
A couple of gotools tests were FAILing on 32-bit Solaris/SPARC like
this:

FAIL: TestCgoHandlesWlORIGIN
	go_test.go:267: running testgo [build origin]
	go_test.go:286: standard error:
	go_test.go:287: # origin
		cannot load DWARF output from $WORK/origin/_obj//_cgo_.o: applyRelocations: not implemented
		
	go_test.go:296: go [build origin] failed unexpectedly: exit status 2

The following patch fixes this by implementing applyRelocationsSPARC.
It's a straightforward derivative of applyRelocationsSPARC64.  The only
point of not is support for the SPARC V8Plus ABI, which is the default
on Solaris these days.  The testcase above PASSes now, a couple of
others still FAIL for different reasons.

	Rainer

Patch

# HG changeset patch
# Parent  ec46539a4547c0a3db20b4c0a5309e8fbbe81bd8
Support 32-bit SPARC relocs

diff --git a/libgo/go/debug/elf/file.go b/libgo/go/debug/elf/file.go
--- a/libgo/go/debug/elf/file.go
+++ b/libgo/go/debug/elf/file.go
@@ -600,6 +600,8 @@  func (f *File) applyRelocations(dst []by
 		return f.applyRelocationsMIPS64(dst, rels)
 	case f.Class == ELFCLASS64 && f.Machine == EM_S390:
 		return f.applyRelocationss390x(dst, rels)
+	case f.Class == ELFCLASS32 && (f.Machine == EM_SPARC || f.Machine == EM_SPARC32PLUS):
+		return f.applyRelocationsSPARC(dst, rels)
 	case f.Class == ELFCLASS64 && f.Machine == EM_SPARCV9:
 		return f.applyRelocationsSPARC64(dst, rels)
 	case f.Class == ELFCLASS64 && f.Machine == EM_ALPHA:
@@ -1006,6 +1008,46 @@  func (f *File) applyRelocationss390x(dst
 	return nil
 }
 
+func (f *File) applyRelocationsSPARC(dst []byte, rels []byte) error {
+	// 12 is the size of Rela32.
+	if len(rels)%12 != 0 {
+		return errors.New("length of relocation section is not a multiple of 12")
+	}
+
+	symbols, _, err := f.getSymbols(SHT_SYMTAB)
+	if err != nil {
+		return err
+	}
+
+	b := bytes.NewReader(rels)
+	var rela Rela32
+
+	for b.Len() > 0 {
+		binary.Read(b, f.ByteOrder, &rela)
+		symNo := rela.Info >> 32
+		t := R_SPARC(rela.Info & 0xff)
+
+		if symNo == 0 || symNo > uint32(len(symbols)) {
+			continue
+		}
+		sym := &symbols[symNo-1]
+		if SymType(sym.Info&0xf) != STT_SECTION {
+			// We don't handle non-section relocations for now.
+			continue
+		}
+
+		switch t {
+		case R_SPARC_32, R_SPARC_UA32:
+			if rela.Off+4 >= uint32(len(dst)) || rela.Addend < 0 {
+				continue
+			}
+			f.ByteOrder.PutUint32(dst[rela.Off:rela.Off+4], uint32(rela.Addend))
+		}
+	}
+
+	return nil
+}
+
 func (f *File) applyRelocationsSPARC64(dst []byte, rels []byte) error {
 	// 24 is the size of Rela64.
 	if len(rels)%24 != 0 {