From f1c8109c5e10cf3eb7944aa8cfd9486e3b82511e Mon Sep 17 00:00:00 2001 From: David Rhodus Date: Sat, 17 Jan 2004 23:05:20 +0000 Subject: [PATCH] * Starting using GCCVER when needed and other things to reflect build changess currently in progress. --- gnu/usr.bin/cc3/Makefile | 3 ++- gnu/usr.bin/cc3/c++/Makefile | 3 ++- gnu/usr.bin/cc3/c++filt/Makefile | 3 ++- gnu/usr.bin/cc3/cc/Makefile | 3 ++- gnu/usr.bin/cc3/cc1/Makefile | 4 ++-- gnu/usr.bin/cc3/cc1obj/Makefile | 4 ++-- gnu/usr.bin/cc3/cc1plus/Makefile | 4 ++-- gnu/usr.bin/cc3/cc_tools/freebsd-native.h | 8 ++++---- gnu/usr.bin/cc3/cccp/Makefile | 4 ++-- gnu/usr.bin/cc3/cpp/Makefile | 3 ++- gnu/usr.bin/cc3/f77/Makefile | 3 ++- gnu/usr.bin/cc3/f771/Makefile | 4 ++-- 12 files changed, 26 insertions(+), 20 deletions(-) diff --git a/gnu/usr.bin/cc3/Makefile b/gnu/usr.bin/cc3/Makefile index abd4e1848d..7bd02c582e 100644 --- a/gnu/usr.bin/cc3/Makefile +++ b/gnu/usr.bin/cc3/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.35 2003/07/11 05:37:23 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/Attic/Makefile,v 1.1 2004/01/17 22:40:14 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. +BINDIR?=/usr/bin/gcc3 SUBDIR= cc_tools cc_int cc cc1 include protoize doc .if !defined(NO_CPP) diff --git a/gnu/usr.bin/cc3/c++/Makefile b/gnu/usr.bin/cc3/c++/Makefile index 2ad506b733..6256bd6bc3 100644 --- a/gnu/usr.bin/cc3/c++/Makefile +++ b/gnu/usr.bin/cc3/c++/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.19 2002/06/04 19:45:08 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/c++/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/c++/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -14,6 +14,7 @@ NOMAN= 1 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" +CFLAGS+= -DGCCVER=\"$(GCCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/c++filt/Makefile b/gnu/usr.bin/cc3/c++filt/Makefile index 0f8d0d9ff9..a211cf816e 100644 --- a/gnu/usr.bin/cc3/c++filt/Makefile +++ b/gnu/usr.bin/cc3/c++filt/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/c++filt/Makefile,v 1.16 2003/07/11 05:37:23 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/c++filt/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/c++filt/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" @@ -7,6 +7,7 @@ PROG= c++filt SRCS= cp-demangle.c cplus-dem+%DIKED.c +BINDIR= /usr/libexec/gcc3/${OBJFORMAT} NOMAN= 1 CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" diff --git a/gnu/usr.bin/cc3/cc/Makefile b/gnu/usr.bin/cc3/cc/Makefile index 83d31e6895..02cd9fe5e2 100644 --- a/gnu/usr.bin/cc3/cc/Makefile +++ b/gnu/usr.bin/cc3/cc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.28 2002/06/05 21:30:43 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cc/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cc/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -16,6 +16,7 @@ LINKS= ${BINDIR}/cc ${BINDIR}/gcc CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" +CFLAGS+= -DGCCVER=\"$(GCCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/cc1/Makefile b/gnu/usr.bin/cc3/cc1/Makefile index 1b66f31d95..376aeb6297 100644 --- a/gnu/usr.bin/cc3/cc1/Makefile +++ b/gnu/usr.bin/cc3/cc1/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.29 2003/07/11 05:37:23 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cc1/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cc1/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" @@ -7,7 +7,7 @@ PROG= cc1 SRCS= main.c c-parse+%DIKED.c c-lang.c c-decl.c c-opts.c -BINDIR= /usr/bin +BINDIR= /usr/libexec/gcc3 NOMAN= 1 NOSHARED?=yes diff --git a/gnu/usr.bin/cc3/cc1obj/Makefile b/gnu/usr.bin/cc3/cc1obj/Makefile index e60b11f3ea..4806c55bda 100644 --- a/gnu/usr.bin/cc3/cc1obj/Makefile +++ b/gnu/usr.bin/cc3/cc1obj/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.22 2002/05/13 03:27:02 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cc1obj/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cc1obj/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" @@ -7,7 +7,7 @@ PROG= cc1obj SRCS= objc-parse+DIKED.c objc-act.c objc-lang.c main.c c-decl.c -BINDIR= /usr/bin +BINDIR= /usr/libexec/gcc3 NOMAN= 1 NOSHARED?=yes diff --git a/gnu/usr.bin/cc3/cc1plus/Makefile b/gnu/usr.bin/cc3/cc1plus/Makefile index e54572ab10..29998e5ed7 100644 --- a/gnu/usr.bin/cc3/cc1plus/Makefile +++ b/gnu/usr.bin/cc3/cc1plus/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.33 2003/07/11 05:37:23 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cc1plus/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cc1plus/Attic/Makefile,v 1.2 2004/01/17 23:05:19 drhodus Exp $ .include "../Makefile.inc" @@ -12,7 +12,7 @@ SRCS+= main.c cp-lang.c c-opts.c \ init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c search.c \ semantics.c spew.c tree.c typeck.c typeck2.c dump.c optimize.c -BINDIR= /usr/bin +BINDIR= /usr/libexec/gcc3 NOMAN= 1 NOSHARED?=yes diff --git a/gnu/usr.bin/cc3/cc_tools/freebsd-native.h b/gnu/usr.bin/cc3/cc_tools/freebsd-native.h index 659b370c43..c9b5210da3 100644 --- a/gnu/usr.bin/cc3/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc3/cc_tools/freebsd-native.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.23 2003/07/11 05:33:24 kan Exp $ */ -/* $DragonFly: src/gnu/usr.bin/cc3/cc_tools/Attic/freebsd-native.h,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +/* $DragonFly: src/gnu/usr.bin/cc3/cc_tools/Attic/freebsd-native.h,v 1.2 2004/01/17 23:05:19 drhodus Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD @@ -35,16 +35,16 @@ */ #undef TOOLDIR_BASE_PREFIX /* Old?? This is not documented. */ #undef STANDARD_BINDIR_PREFIX /* We don't need one for now. */ -#define STANDARD_EXEC_PREFIX PREFIX"/libexec/" +#define STANDARD_EXEC_PREFIX PREFIX"/libexec/gcc3" #undef MD_EXEC_PREFIX /* We don't want one. */ #define FBSD_DATA_PREFIX PREFIX"/libdata/gcc/" /* Under FreeBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */ -#define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" +#define STANDARD_STARTFILE_PREFIX PREFIX"/lib/gcc3" #ifdef CROSS_COMPILE -#define CROSS_STARTFILE_PREFIX PREFIX"/lib/" +#define CROSS_STARTFILE_PREFIX PREFIX"/lib/gcc3" #endif #undef MD_STARTFILE_PREFIX /* We don't need one for now. */ diff --git a/gnu/usr.bin/cc3/cccp/Makefile b/gnu/usr.bin/cc3/cccp/Makefile index 71a0cfd786..91a5119b00 100644 --- a/gnu/usr.bin/cc3/cccp/Makefile +++ b/gnu/usr.bin/cc3/cccp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cccp/Makefile,v 1.24 2002/05/13 03:27:02 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cccp/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cccp/Attic/Makefile,v 1.2 2004/01/17 23:05:20 drhodus Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ PROG= cpp0 SRCS= cppmain.c c-parse+%DIKED.c c-lang.c c-decl.c -BINDIR= /usr/bin +BINDIR= /usr/libexec/gcc3 NOMAN= 1 NOSHARED?=yes diff --git a/gnu/usr.bin/cc3/cpp/Makefile b/gnu/usr.bin/cc3/cpp/Makefile index 9cc7171252..0e60c95328 100644 --- a/gnu/usr.bin/cc3/cpp/Makefile +++ b/gnu/usr.bin/cc3/cpp/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.23 2003/06/06 13:46:55 kuriyama Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/cpp/Attic/Makefile,v 1.1 2004/01/17 22:40:15 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/cpp/Attic/Makefile,v 1.2 2004/01/17 23:05:20 drhodus Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -11,6 +11,7 @@ SRCS= gcc.c cppspec.c CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" +CFLAGS+= -DGCCVER=\"$(GCCVER)\" DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/f77/Makefile b/gnu/usr.bin/cc3/f77/Makefile index 43af95937f..aab78883f5 100644 --- a/gnu/usr.bin/cc3/f77/Makefile +++ b/gnu/usr.bin/cc3/f77/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/f77/Makefile,v 1.21 2004/01/05 20:23:16 kan Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/f77/Attic/Makefile,v 1.1 2004/01/17 22:40:16 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/f77/Attic/Makefile,v 1.2 2004/01/17 23:05:20 drhodus Exp $ .include "../Makefile.inc" .include "../Makefile.fe" @@ -11,6 +11,7 @@ SRCS= gcc.c g77spec.c CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\" CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\" +CFLAGS+= -DGCCVER=\"$(GCCVER)\" CFLAGS+= -DFORTRAN_INIT=\"-lg2c\" -DFORTRAN_INIT_PROFILE=\"-lg2c_p\" DPADD= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc3/f771/Makefile b/gnu/usr.bin/cc3/f771/Makefile index 65eb9662d1..ef270c8092 100644 --- a/gnu/usr.bin/cc3/f771/Makefile +++ b/gnu/usr.bin/cc3/f771/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/f771/Makefile,v 1.10 2004/01/11 20:45:46 ru Exp $ -# $DragonFly: src/gnu/usr.bin/cc3/f771/Attic/Makefile,v 1.1 2004/01/17 22:40:16 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/cc3/f771/Attic/Makefile,v 1.2 2004/01/17 23:05:20 drhodus Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -10,7 +10,7 @@ SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c \ intrin.c lab.c lex.c malloc.c name.c parse.c src.c st.c sta.c \ stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \ stw.c symbol.c target.c top.c type.c where.c main.c -BINDIR= /usr/libexec +BINDIR= /usr/libexec/gcc3 NOMAN= CFLAGS+= -I${GCCDIR}/f -I. -- 2.41.0