diff options
| author | mrg <mrg@NetBSD.org> | 2006-06-23 17:27:08 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2006-06-23 17:27:08 +0000 |
| commit | 5378eb236801632b17fa2ecefab9bf9d0efb50ed (patch) | |
| tree | 9d34de261d5b4e6dcfd1c5e473fb25945cb078a2 /gnu/lib | |
| parent | e9b01fa0619df8aeed1ef3a8b16c6a8b2cc8abf0 (diff) | |
factor out the unwind.h building code. use it for libgcc itself (needed
when there is no libgcc_s.)
add dependancies for the generated arch/defs.mk to optionlist.
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libgcc4/Makefile.unwind_h | 15 | ||||
| -rw-r--r-- | gnu/lib/libgcc4/libgcc/Makefile | 4 | ||||
| -rw-r--r-- | gnu/lib/libgcc4/libgcc_eh/Makefile | 9 | ||||
| -rw-r--r-- | gnu/lib/libgcc4/libgcc_s/Makefile | 9 | ||||
| -rw-r--r-- | gnu/lib/libobjc4/Makefile | 5 |
5 files changed, 25 insertions, 17 deletions
diff --git a/gnu/lib/libgcc4/Makefile.unwind_h b/gnu/lib/libgcc4/Makefile.unwind_h new file mode 100644 index 00000000000..271f735bccb --- /dev/null +++ b/gnu/lib/libgcc4/Makefile.unwind_h @@ -0,0 +1,15 @@ +# $NetBSD: Makefile.unwind_h,v 1.1 2006/06/23 17:27:08 mrg Exp $ + +.if !defined(_GNU_LIBGCC_UNWIND_H) +_GNU_LIBGCC_UNWIND_H=1 + +# fragment to build unwind.h. + +${LIB2_EH}: unwind.h +unwind.h: ${G_UNWIND_H} + ${_MKTARGET_CREATE} + rm -f ${.TARGET} + ln -s ${G_UNWIND_H} ${.TARGET} +CLEANFILES+= unwind.h + +.endif diff --git a/gnu/lib/libgcc4/libgcc/Makefile b/gnu/lib/libgcc4/libgcc/Makefile index e6910451687..80dc2e3b2a9 100644 --- a/gnu/lib/libgcc4/libgcc/Makefile +++ b/gnu/lib/libgcc4/libgcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/23 17:27:08 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -23,6 +23,8 @@ SRCS+= ${LIB2_EH} .include <bsd.lib.mk> +.include "../Makefile.unwind_h" + CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2} .c.so: diff --git a/gnu/lib/libgcc4/libgcc_eh/Makefile b/gnu/lib/libgcc4/libgcc_eh/Makefile index 56e5f8fb592..7a2a858ba74 100644 --- a/gnu/lib/libgcc4/libgcc_eh/Makefile +++ b/gnu/lib/libgcc4/libgcc_eh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/23 17:27:08 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -18,12 +18,7 @@ SRCS+= ${LIB2_EH} .include <bsd.lib.mk> -${LIB2_EH}: unwind.h -unwind.h: ${G_UNWIND_H} - ${_MKTARGET_CREATE} - rm -f ${.TARGET} - ln -s ${G_UNWIND_H} ${.TARGET} -CLEANFILES+= unwind.h +.include "../Makefile.unwind_h" .else .include <bsd.prog.mk> # do nothing diff --git a/gnu/lib/libgcc4/libgcc_s/Makefile b/gnu/lib/libgcc4/libgcc_s/Makefile index 2e14052ce09..696aada71da 100644 --- a/gnu/lib/libgcc4/libgcc_s/Makefile +++ b/gnu/lib/libgcc4/libgcc_s/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/05/10 22:53:50 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/23 17:27:08 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -31,12 +31,7 @@ CLEANFILES+= libgcc.map .include <bsd.lib.mk> -${LIB2_EH}: unwind.h -unwind.h: ${G_UNWIND_H} - ${_MKTARGET_CREATE} - rm -f ${.TARGET} - ln -s ${G_UNWIND_H} ${.TARGET} -CLEANFILES+= unwind.h +.include "../Makefile.unwind_h" .if ${MKPICLIB} != "no" LIBGCC_S_OBJS= ${SOBJS} diff --git a/gnu/lib/libobjc4/Makefile b/gnu/lib/libobjc4/Makefile index a66e13479a9..13577281f5b 100644 --- a/gnu/lib/libobjc4/Makefile +++ b/gnu/lib/libobjc4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/04 02:30:56 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/23 17:27:08 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -28,6 +28,7 @@ LIBGCCOBJ!= cd ${.CURDIR}/../libgcc4/libgcc && ${PRINTOBJDIR} DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4 GNUHOSTDIST= ${NETBSDSRCDIR}/gnu/dist/gcc4 GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH} +LIBOBJCARCH= ${NETBSDSRCDIR}/gnu/lib/libobjc4/arch/${MACHINE_ARCH} GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH} SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m @@ -91,7 +92,7 @@ CLEANFILES+= tconfig.h unwind.h # XXX just while all platforms defs.mk are updated.. .if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) -optionlist: ${G_ALL_OPT_FILES) Makefile ${DIST}/gcc/opt-gather.awk +optionlist: ${G_ALL_OPT_FILES} ${LIBOBJCARCH}/defs.mk Makefile ${DIST}/gcc/opt-gather.awk ${AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} > ${.TARGET} options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk |
