summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2003-07-25 17:19:22 +0000
committermrg <mrg@NetBSD.org>2003-07-25 17:19:22 +0000
commitbad540d0790035de800af2e07aaaafbf0704b336 (patch)
treec7a4e60a87261d22214b35976de537e0994afe10 /gnu/usr.bin
parentae9855d2fe7ff21f0295687d8401a5f646a91037 (diff)
clean up and fix a couple of build-from-cleandir problems
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/gcc3/Makefile.inc13
-rw-r--r--gnu/usr.bin/gcc3/backend/Makefile23
-rw-r--r--gnu/usr.bin/gcc3/f771/Makefile11
-rw-r--r--gnu/usr.bin/gcc3/f771/my-xmalloc.c22
-rw-r--r--gnu/usr.bin/gcc3/g77/Makefile4
5 files changed, 26 insertions, 47 deletions
diff --git a/gnu/usr.bin/gcc3/Makefile.inc b/gnu/usr.bin/gcc3/Makefile.inc
index 6dc11bddf12..df4c4e4dd81 100644
--- a/gnu/usr.bin/gcc3/Makefile.inc
+++ b/gnu/usr.bin/gcc3/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2003/07/25 16:32:24 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2003/07/25 17:19:22 mrg Exp $
.include <bsd.own.mk>
@@ -18,9 +18,12 @@ NBCOMPATLIB= -L${COMPATOBJDIR} -lnbcompat
GNUHOSTDIST= ${DIST}
BUILD_PREFIX= ${C_BUILD_PREFIX}
-LIBIBERTYOBJ!= cd ${.CURDIR}/../libiberty && ${PRINTOBJDIR}
-FRONTENDOBJ!= cd ${.CURDIR}/../frontend && ${PRINTOBJDIR}
-BACKENDOBJ!= cd ${.CURDIR}/../backend && ${PRINTOBJDIR}
-LIBCPPOBJ!= cd ${.CURDIR}/../libcpp && ${PRINTOBJDIR}
+LIBIBERTYOBJ!= cd ${.CURDIR}/../libiberty && ${PRINTOBJDIR}
+FRONTENDOBJ!= cd ${.CURDIR}/../frontend && ${PRINTOBJDIR}
+BACKENDOBJ!= cd ${.CURDIR}/../backend && ${PRINTOBJDIR}
+LIBCPPOBJ!= cd ${.CURDIR}/../libcpp && ${PRINTOBJDIR}
+
+HOSTLIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
+HOSTLIBIBERTY= ${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a
.include "${GCCARCH}/defs.mk"
diff --git a/gnu/usr.bin/gcc3/backend/Makefile b/gnu/usr.bin/gcc3/backend/Makefile
index f4092b5f1eb..52ef57c3468 100644
--- a/gnu/usr.bin/gcc3/backend/Makefile
+++ b/gnu/usr.bin/gcc3/backend/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/25 16:32:30 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/25 17:19:23 mrg Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -10,8 +10,7 @@ LIB= backend
SRCS= ${G_OBJS:.o=.c} ${G_out_file:T}
CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
- -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\" \
- -DTARGET_CPU_DEFAULT=${G_target_cpu_default}
+ -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\"
HOST_CPPFLAGS+= -I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
.include <bsd.lib.mk>
@@ -30,15 +29,13 @@ CLEANFILES+= gengenrtl gengenrtl.o genrtl.c genrtl.h \
gt-*.h *.o \
config.h cs-config.h \
-LIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
-LIBIBERTY= ${LIBIBERTYOBJ}/libiberty/libiberty.a
-
#
# These files have special needs
#
COPTS.prefix.o= -DPREFIX=\"$(prefix)\"
COPTS.toplev.o= -DTARGET_NAME=\"$(target_alias)\"
COPTS.insn-conditions.c= -DGENERATOR_FILE
+COPTS.sparc.o= -DTARGET_CPU_DEFAULT=${G_target_cpu_default}
#
# Generate the various header files we need.
@@ -49,19 +46,19 @@ genrtl.c genrtl.h: gengenrtl
gengenrtl.o: gengenrtl.c
${HOST_COMPILE.c} $>
gengenrtl: gengenrtl.o
- ${HOST_LINK.c} -o gengenrtl $> ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o gengenrtl $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
tm-preds.h: genpreds
./genpreds > tm-preds.h
genpreds.o: genpreds.c
${HOST_COMPILE.c} $>
genpreds: genpreds.o
- ${HOST_LINK.c} -o genpreds $> ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o genpreds $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
#gencheck.o: gencheck.c
# ${HOST_COMPILE.c} $>
tree-check.h: gencheck.c
- ${HOST_LINK.c} -o gencheck $> ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o gencheck $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
./gencheck >$@
gtype-desc.c: gtype-desc.h
@@ -77,7 +74,7 @@ gengtype-lex.o: gengtype-lex.c
gengtype-yacc.o: gengtype-yacc.c
${HOST_COMPILE.c} $>
gengtype: gengtype.o gtyp-gen.h gengtype-lex.o gengtype-yacc.o config.h
- ${HOST_LINK.c} -o gengtype gengtype.o gengtype-lex.o gengtype-yacc.o ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o gengtype gengtype.o gengtype-lex.o gengtype-yacc.o ${NBCOMPATLIB} ${HOSTLIBIBERTY}
gtyp-gen.h: Makefile
( echo "static const char *srcdir = \"$(G_GTFILES_SRCDIR)\";" ; \
@@ -170,7 +167,7 @@ gen${f:R}.o: gen${f:R}.c
insn-${f:R}.o:
${HOST_COMPILE.c} ${COPTS.${.IMPSRC:T}} insn-${f:R}.c
insn-${f}: genrtl.h ${G_md_file} ${EXTRADEPENDSEARLY:.c=.o} gen${f:R}.o
- ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDSEARLY:.c=.o} ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDSEARLY:.c=.o} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
./gen${f:R} ${G_md_file} >$@
.endfor
@@ -190,7 +187,7 @@ CLEANFILES+= gen${f:R} insn-${f}
gen${f:R}.o: gen${f:R}.c
${HOST_COMPILE.c} $>
insn-${f}: genrtl.h ${G_md_file} ${EXTRADEPENDS:.c=.o} gen${f:R}.o
- ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDS:.c=.o} ${NBCOMPATLIB} ${LIBIBERTY}
+ ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDS:.c=.o} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
./gen${f:R} ${G_md_file} >$@
.endfor
@@ -203,7 +200,7 @@ genattrtab.o: genattrtab.c
genautomata.o: genautomata.c
${HOST_COMPILE.c} $>
insn-attrtab.c: genrtl.h ${G_md_file} ${EXTRADEPENDS:.c=.o} ${G_HOST_VARRAY:.c=.o} genattrtab.o genautomata.o
- ${HOST_LINK.c} -o genattrtab genattrtab.o genautomata.o ${EXTRADEPENDS:.c=.o} ${G_HOST_VARRAY:.c=.o} ${NBCOMPATLIB} ${LIBIBERTY} -lm
+ ${HOST_LINK.c} -o genattrtab genattrtab.o genautomata.o ${EXTRADEPENDS:.c=.o} ${G_HOST_VARRAY:.c=.o} ${NBCOMPATLIB} ${HOSTLIBIBERTY} -lm
./genattrtab ${G_md_file} >$@
#
diff --git a/gnu/usr.bin/gcc3/f771/Makefile b/gnu/usr.bin/gcc3/f771/Makefile
index 789ba8bf5bb..89b7da0c679 100644
--- a/gnu/usr.bin/gcc3/f771/Makefile
+++ b/gnu/usr.bin/gcc3/f771/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/25 16:32:34 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/25 17:19:24 mrg Exp $
PROG= f771
SRCS= ${G_F77_OBJS:.o=.c} main.c
@@ -7,10 +7,8 @@ CPPFLAGS+= -I${DIST}/gcc/f -I.
HOST_CPPFLAGS+= -I${GCCARCH} -DUSE_HCONFIG= \
${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
-.include "../Makefile.backend"
-
-fini: fini.c safe-ctype.c my-xmalloc.c
- ${HOST_LINK.c} -o $@ $>
+fini: fini.c
+ ${HOST_LINK.c} -o $@ $> ${HOSTLIBIBERTY}
CLEANFILES+= fini
.for f in 1t 2t fo io nq op ot
@@ -23,6 +21,9 @@ ${OBJS} .depend: str-${f}.h
.endfor
CLEANFILES+= main.c
+
+.include "../Makefile.backend"
+
main.c: ${DIST}/gcc/main.c
rm -f main.c
ln -s $> main.c
diff --git a/gnu/usr.bin/gcc3/f771/my-xmalloc.c b/gnu/usr.bin/gcc3/f771/my-xmalloc.c
deleted file mode 100644
index 47a1cd95aa1..00000000000
--- a/gnu/usr.bin/gcc3/f771/my-xmalloc.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: my-xmalloc.c,v 1.1 2003/07/25 16:32:34 mrg Exp $ */
-
-/* Written by Matthew Green. Public domain. */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-void *xmalloc(size_t size);
-
-void *
-xmalloc(size)
- size_t size;
-{
- void *p;
-
- p = malloc(size);
- if (p == NULL) {
- fprintf(stderr, "out of memory allocated %u bytes\n", (unsigned)size);
- exit(1);
- }
- return p;
-}
diff --git a/gnu/usr.bin/gcc3/g77/Makefile b/gnu/usr.bin/gcc3/g77/Makefile
index 650808fd87f..3aae792bb94 100644
--- a/gnu/usr.bin/gcc3/g77/Makefile
+++ b/gnu/usr.bin/gcc3/g77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/07/25 16:32:36 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/25 17:19:26 mrg Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ MLINKS= g77.1 f77.1 \
g77.1 fort77.1
TEXINFO= g77.texi
-INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/gcc/f -I${DIST}/gcc/doc/include
+INFOFLAGS= -I${DIST}/gcc/f -I${DIST}/gcc/doc -I${DIST}/gcc/doc/include
.include "../Makefile.frontend"