- install ldscripts into /usr/libdata/ldscripts.

- fix makefile to set SCRIPTDIR to /usr/libdata, to stop ld from
  looking in /usr/libdata/ldscripts/ldscripts.
- enable elf32_sparc & sun4 emulation in ld.new (elf32_sparc appears
  to work correctly, sun4 untested).
- add elf64_sparc emul to the list while i'm here...
This commit is contained in:
mrg 1998-12-17 13:59:05 +00:00
parent 85078af6c4
commit ca73b352a6
3 changed files with 12 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 1998/09/30 16:47:47 jonathan Exp $
# $NetBSD: Makefile,v 1.4 1998/12/17 13:59:05 mrg Exp $
# XXX set MACHINE_GNU_ARCH for _<arch>.mk
.include <bsd.own.mk>
@ -9,11 +9,12 @@ SRCS= ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c ldmain.c ldmisc.c \
ldver.c ldwrite.c lexsup.c mri.c ldcref.c ldgram.y ldlex.l
MAN= ld.1
YHEADER=1
SCRIPTDIR= /usr/libdata
CPPFLAGS+= -I. -I${.CURDIR} -I${BFDOBJ} -I${DIST}/ld \
-I${DIST}/bfd -I${DIST}/include \
-DDEFAULT_EMULATION='"${DEFAULT_EMUL}"' \
-DSCRIPTDIR='"/usr/libdata/ldscripts"' \
-DSCRIPTDIR=\"${SCRIPTDIR}\" \
-DTARGET='"${MACHINE_GNU_ARCH}--netbsd"' \
-DEMULATION_LIST='${EMULS:S/^/\&ld_/:S/$/_emulation,/} 0'
@ -26,10 +27,8 @@ BFDOBJ!= cd ${.CURDIR}/../../lib/bfd; ${MAKE} print-objdir
.PATH: ${DIST}/ld
.include "_${MACHINE_ARCH}.mk"
LIB_PATH= ${LIBDIR} # passed to genscripts.sh
.for _EMUL_ in ${EMULS}
@ -42,7 +41,9 @@ e${_EMUL_}.c: ${DIST}/ld/genscripts.sh ${DIST}/ld/emulparams/${_EMUL_}.sh
"" ${_EMUL_}
.endfor
# perhaps these will be installed as well.
afterinstall:
pax -rw ldscripts ${DESTDIR}${SCRIPTDIR}
cleanprog: __cleanldscripts
__cleanldscripts:
rm -rf ldscripts

View File

@ -1,4 +1,4 @@
# $NetBSD: _sparc.mk,v 1.1 1998/12/12 21:57:19 kristerw Exp $
# $NetBSD: _sparc.mk,v 1.2 1998/12/17 13:59:05 mrg Exp $
EMULS= sparcnbsd
EMULS= sparcnbsd elf32_sparc sun4
DEFAULT_EMUL= sparcnbsd

View File

@ -1,4 +1,4 @@
/* $NetBSD: ldemul-list.h,v 1.3 1998/12/12 21:57:19 kristerw Exp $ */
/* $NetBSD: ldemul-list.h,v 1.4 1998/12/17 13:59:05 mrg Exp $ */
/* alpha emulations */
extern ld_emulation_xfer_type ld_elf64alpha_emulation;
@ -11,4 +11,7 @@ extern ld_emulation_xfer_type ld_elf32lmip_emulation;
extern ld_emulation_xfer_type ld_elf32bmip_emulation;
/* sparc emulations */
extern ld_emulation_xfer_type ld_elf32_sparc_emulation;
extern ld_emulation_xfer_type ld_elf64_sparc_emulation;
extern ld_emulation_xfer_type ld_sun4_emulation;
extern ld_emulation_xfer_type ld_sparcnbsd_emulation;