Commit a crude hack so we get sparc64 snapshots working again with a

stable ld.so.  We need to revisit the rtld-elf/sparc64/rtld_start.S
rev. 1.5 and rtld-elf/sparc64/rtld_machdep.h rev. 1.5, which was
suppose to allow stock Binutils 2.13 (and later) to be used.
This commit is contained in:
David E. O'Brien 2004-06-17 16:08:20 +00:00
parent 4238db7522
commit d8a921c775
3 changed files with 19 additions and 4 deletions

View File

@ -7,7 +7,7 @@ SRCS+= aout32.c \
elf32-sparc.c \
elf32-target.h \
elf32.c \
elf64-sparc.c \
elf64-sparc%FIXED.c \
elf64-target.h \
elf64.c \
elflink.c \
@ -25,3 +25,8 @@ elf32-target.h: elfxx-target.h
elf64-target.h: elfxx-target.h
sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
CLEANFILES+= elf64-sparc%FIXED.c
elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff
cp ${.ALLSRC:M*.c} ${.TARGET}
patch -b .orig < ${.ALLSRC:M*.diff}

View File

@ -0,0 +1,13 @@
$FreeBSD$
Index: elf64-sparc.c
===================================================================
RCS file: /home/ncvs/src/contrib/binutils/bfd/elf64-sparc.c,v
retrieving revision 1.1.1.12
diff -u -u -0 -r1.1.1.12 elf64-sparc.c
--- elf64-sparc%FIXED.c 16 Jun 2004 05:44:32 -0000 1.1.1.12
+++ elf64-sparc%FIXED.c 17 Jun 2004 05:24:42 -0000
@@ -2790,2 +2790,2 @@
- bfd_put_64 (output_bfd, (bfd_vma) 0,
- sgot->contents + (h->got.offset &~ (bfd_vma) 1));
+//XXX:DEO bfd_put_64 (output_bfd, (bfd_vma) 0,
+// sgot->contents + (h->got.offset &~ (bfd_vma) 1));

View File

@ -43,9 +43,6 @@ _named-xfer= named-xfer
_ftp-proxy= ftp-proxy
.endif
.if ${MACHINE_ARCH} == "sparc64"
NOPIC=yes
.endif
.if !defined(NOPIC)
_rtld-elf= rtld-elf
.endif