MACHINE_ARCH support

This commit is contained in:
cgd 1993-12-05 00:49:23 +00:00
parent 015ffcc6b3
commit 1d330d5df9
13 changed files with 38 additions and 40 deletions

View File

@ -1,13 +1,13 @@
# from: @(#)Makefile 6.1 (Berkeley) 3/3/91 # from: @(#)Makefile 6.1 (Berkeley) 3/3/91
# $Id: Makefile,v 1.10 1993/10/16 22:04:48 pk Exp $ # $Id: Makefile,v 1.11 1993/12/05 00:54:33 cgd Exp $
.include "config/Makefile.$(MACHINE)" .include "config/Makefile.$(MACHINE_ARCH)"
.if !defined (gas_hosttype) .if !defined (gas_hosttype)
gas_hosttype=$(MACHINE) gas_hosttype=$(MACHINE_ARCH)
.endif .endif
.if !defined (gas_target) .if !defined (gas_target)
gas_target=$(MACHINE) gas_target=$(MACHINE_ARCH)
.endif .endif
.if !defined (gas_objformat) .if !defined (gas_objformat)
gas_objformat=aout gas_objformat=aout
@ -35,12 +35,12 @@ CONF_HEADERS= targ-cpu.h obj-format.h host.h targ-env.h
beforedepend ${PROG}: ${CONF_HEADERS} beforedepend ${PROG}: ${CONF_HEADERS}
targ-cpu.h: Makefile config/Makefile.$(MACHINE) targ-cpu.h: Makefile config/Makefile.$(MACHINE_ARCH)
@cmp -s $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h || \ @cmp -s $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h || \
( echo "updating ${.TARGET}..." ; /bin/rm -f targ-cpu.h ; \ ( echo "updating ${.TARGET}..." ; /bin/rm -f targ-cpu.h ; \
cp $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h ) cp $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h )
obj-format.h: Makefile config/Makefile.$(MACHINE) obj-format.h: Makefile config/Makefile.$(MACHINE_ARCH)
@cmp -s $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h || \ @cmp -s $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h || \
( echo "updating ${.TARGET}..." ; /bin/rm -f obj-format.h ; \ ( echo "updating ${.TARGET}..." ; /bin/rm -f obj-format.h ; \
cp $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h ) cp $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h )
@ -51,18 +51,18 @@ config_hostfile= $(.CURDIR)/config/ho-$(gas_hosttype).h
config_hostfile= $(.CURDIR)/config/ho-generic.h config_hostfile= $(.CURDIR)/config/ho-generic.h
.endif .endif
host.h: Makefile config/Makefile.$(MACHINE) host.h: Makefile config/Makefile.$(MACHINE_ARCH)
@cmp -s $(config_hostfile) host.h || \ @cmp -s $(config_hostfile) host.h || \
( echo "updating ${.TARGET}..." ; /bin/rm -f host.h ; \ ( echo "updating ${.TARGET}..." ; /bin/rm -f host.h ; \
cp $(config_hostfile) host.h ) cp $(config_hostfile) host.h )
.if exists ($(.CURDIR)/config/te-$(MACHINE).h) .if exists ($(.CURDIR)/config/te-$(MACHINE_ARCH).h)
config_targenvfile= $(.CURDIR)/config/te-$(MACHINE).h config_targenvfile= $(.CURDIR)/config/te-$(MACHINE_ARCH).h
.else .else
config_targenvfile= $(.CURDIR)/config/te-generic.h config_targenvfile= $(.CURDIR)/config/te-generic.h
.endif .endif
targ-env.h: Makefile config/Makefile.$(MACHINE) targ-env.h: Makefile config/Makefile.$(MACHINE_ARCH)
@cmp -s $(config_targenvfile) targ-env.h || \ @cmp -s $(config_targenvfile) targ-env.h || \
( echo "updating ${.TARGET}..." ; /bin/rm -f targ-env.h ; \ ( echo "updating ${.TARGET}..." ; /bin/rm -f targ-env.h ; \
cp $(config_targenvfile) targ-env.h ) cp $(config_targenvfile) targ-env.h )

View File

@ -1,7 +1,5 @@
# from: @(#)Makefile.hp300 6.1 (Berkeley) 3/3/91 # from: @(#)Makefile.hp300 6.1 (Berkeley) 3/3/91
# $Id: Makefile.m68k,v 1.2 1993/12/05 00:48:10 cgd Exp $ # $Id: Makefile.m68k,v 1.3 1993/12/05 00:55:05 cgd Exp $
CFLAGS+= -Dm68851 CFLAGS+= -Dm68851
SRCS+= tc-m68k.c atof-ieee.c SRCS+= tc-m68k.c atof-ieee.c
gas_target= m68k

View File

@ -1,11 +1,11 @@
# $Id: Makefile.cc1,v 1.3 1993/10/07 07:24:17 cgd Exp $ # $Id: Makefile.cc1,v 1.4 1993/12/05 00:49:23 cgd Exp $
NOMAN= NOMAN=
BINDIR= /usr/libexec BINDIR= /usr/libexec
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common \ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common \
-I${.CURDIR}/../arch -I${.CURDIR}/../arch/${MACHINE} -I${.CURDIR}/../arch -I${.CURDIR}/../arch/${MACHINE_ARCH}
YFLAGS= YFLAGS=
.if exists(${.CURDIR}/../common/obj) .if exists(${.CURDIR}/../common/obj)

View File

@ -1,6 +1,6 @@
/* Configuration for an i386 running 386BSD as the target machine. /* Configuration for an i386 running 386BSD as the target machine.
$Id: tm.h,v 1.3 1993/11/26 07:02:08 pk Exp $ $Id: tm.h,v 1.4 1993/12/05 00:49:43 cgd Exp $
*/ */
/* This is tested by i386gas.h. */ /* This is tested by i386gas.h. */
@ -12,7 +12,7 @@
#include "i386/perform.h" #include "i386/perform.h"
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -D__BSD_NET2__ -D__NetBSD__ -D__386BSD__" #define CPP_PREDEFINES "-Di386 -D__NetBSD__ -D__386BSD__ -Dunix"
/* Like the default, except no -lg. */ /* Like the default, except no -lg. */
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"

View File

@ -1,7 +1,7 @@
/* $Id: tm.h,v 1.2 1993/11/26 07:18:45 pk Exp $ */ /* $Id: tm.h,v 1.3 1993/12/05 00:50:03 cgd Exp $ */
#include <machine/ansi.h> #include <machine/ansi.h>
#include "da30/m68k.h" #include "m68k/m68k.h"
/* See m68k.h. 7 means 68020 with 68881. */ /* See m68k.h. 7 means 68020 with 68881. */
@ -14,7 +14,7 @@
/* Names to predefine in the preprocessor for this target machine. */ /* Names to predefine in the preprocessor for this target machine. */
#define CPP_PREDEFINES "-Dmc68000 -Dmc68020 -Dunix -D__BSD_NET2__ -D__NetBSD__ -Dda30" #define CPP_PREDEFINES "-Dm68k -Dmc68000 -Dmc68020 -D__NetBSD__ -Dunix"
/* Specify -k to assembler for PIC code generation. */ /* Specify -k to assembler for PIC code generation. */

View File

@ -1,5 +1,5 @@
/* Configuration for NetBSD Sparc */ /* Configuration for NetBSD Sparc */
/* $Id: tm.h,v 1.2 1993/12/03 20:55:55 pk Exp $ */ /* $Id: tm.h,v 1.3 1993/12/05 00:50:22 cgd Exp $ */
#include "sparc/sparc.h" #include "sparc/sparc.h"
@ -7,7 +7,7 @@
#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} %{g:-lg}" #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} %{g:-lg}"
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dsparc -D__NetBSD__ -D__BSD_NET2__ -Dunix" #define CPP_PREDEFINES "-Dsparc -D__NetBSD__ -Dunix"
/* Provide required defaults for linker -e and -d switches. */ /* Provide required defaults for linker -e and -d switches. */
#define LINK_SPEC \ #define LINK_SPEC \

View File

@ -1,12 +1,12 @@
# from: @(#)Makefile 6.2 (Berkeley) 3/25/91 # from: @(#)Makefile 6.2 (Berkeley) 3/25/91
# $Id: Makefile,v 1.8 1993/10/07 07:24:24 cgd Exp $ # $Id: Makefile,v 1.9 1993/12/05 00:50:49 cgd Exp $
PROG= cc PROG= cc
SRCS= gcc.c version.c obstack.c SRCS= gcc.c version.c obstack.c
MAN1= gcc.0 g++.0 MAN1= gcc.0 g++.0
BINDIR= /usr/bin BINDIR= /usr/bin
CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../common \ CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../common \
-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE) -I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH)
LDADD+= -lgnumalloc LDADD+= -lgnumalloc
DPADD+= /usr/lib/libgnumalloc.a DPADD+= /usr/lib/libgnumalloc.a

View File

@ -1,11 +1,11 @@
# $Id: Makefile,v 1.2 1993/10/03 13:50:49 pk Exp $ # $Id: Makefile,v 1.3 1993/12/05 00:51:23 cgd Exp $
LIB= cc1 LIB= cc1
NOPROFILE= NOPROFILE=
NOPIC= NOPIC=
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch -I${.CURDIR}/../arch/${MACHINE} CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../arch -I${.CURDIR}/../arch/${MACHINE_ARCH}
.PATH: ${.CURDIR}/../arch/${MACHINE} .PATH: ${.CURDIR}/../arch/${MACHINE_ARCH}
# machine-independent # machine-independent
SRCS+= c-common.c caller-save.c calls.c combine.c convert.c cse.c dbxout.c \ SRCS+= c-common.c caller-save.c calls.c combine.c convert.c cse.c dbxout.c \

View File

@ -1,12 +1,12 @@
# from: @(#)Makefile 6.4 (Berkeley) 2/21/91 # from: @(#)Makefile 6.4 (Berkeley) 2/21/91
# $Id: Makefile,v 1.8 1993/10/07 07:24:33 cgd Exp $ # $Id: Makefile,v 1.9 1993/12/05 00:51:34 cgd Exp $
PROG= cpp PROG= cpp
BINDIR= /usr/libexec BINDIR= /usr/libexec
SRCS= cccp.c cexp.y version.c SRCS= cccp.c cexp.y version.c
MAN1= cpp.0 MAN1= cpp.0
CFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../common \ CFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../common \
-I$(.CURDIR)/../arch/$(MACHINE) -I$(.CURDIR)/../arch \ -I$(.CURDIR)/../arch/$(MACHINE_ARCH) -I$(.CURDIR)/../arch \
-DGCC_INCLUDE_DIR=\"\" \ -DGCC_INCLUDE_DIR=\"\" \
-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\" -DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\"
LDADD+= -lgnumalloc LDADD+= -lgnumalloc

View File

@ -1,10 +1,10 @@
# $Id: Makefile,v 1.6 1993/10/03 14:07:18 pk Exp $ # $Id: Makefile,v 1.7 1993/12/05 00:51:51 cgd Exp $
LIB= gcc LIB= gcc
NOPROFILE= NOPROFILE=
CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \ CFLAGS+=-I${.CURDIR}/../common -I${.CURDIR}/../arch \
-I${.CURDIR}/../arch/${MACHINE} -I${.CURDIR}/../arch/${MACHINE_ARCH}
LIB1OBJS= _mulsi3.o _udivsi3.o _divsi3.o _umodsi3.o _modsi3.o _lshrsi3.o \ LIB1OBJS= _mulsi3.o _udivsi3.o _divsi3.o _umodsi3.o _modsi3.o _lshrsi3.o \
_lshlsi3.o _ashrsi3.o _ashlsi3.o _divdf3.o _muldf3.o _negdf2.o \ _lshlsi3.o _ashrsi3.o _ashlsi3.o _divdf3.o _muldf3.o _negdf2.o \

View File

@ -1,15 +1,15 @@
# $Id: Makefile,v 1.8 1993/11/03 13:01:36 cgd Exp $ # $Id: Makefile,v 1.9 1993/12/05 00:54:41 cgd Exp $
# #
PROG= ld PROG= ld
SRCS= ld.c symbol.c lib.c shlib.c warnings.c etc.c rrs.c xbits.c md.c SRCS= ld.c symbol.c lib.c shlib.c warnings.c etc.c rrs.c xbits.c md.c
CFLAGS += -g -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE) CFLAGS += -g -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE_ARCH)
LDADD+= -lgnumalloc LDADD+= -lgnumalloc
DPADD+= /usr/lib/libgnumalloc.a DPADD+= /usr/lib/libgnumalloc.a
SUBDIR= ldconfig ldd rtld SUBDIR= ldconfig ldd rtld
.PATH: $(.CURDIR)/$(MACHINE) .PATH: $(.CURDIR)/$(MACHINE_ARCH)
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,13 +1,13 @@
# $Id: Makefile,v 1.3 1993/12/02 07:21:19 mycroft Exp $ # $Id: Makefile,v 1.4 1993/12/05 00:55:03 cgd Exp $
PROG= ldconfig PROG= ldconfig
SRCS= ldconfig.c shlib.c etc.c SRCS= ldconfig.c shlib.c etc.c
LDDIR?= $(.CURDIR)/.. LDDIR?= $(.CURDIR)/..
LDFLAGS += -static LDFLAGS += -static
CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) -O CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) -O
BINDIR= /sbin BINDIR= /sbin
MAN8 = ldconfig.0 MAN8 = ldconfig.0
.PATH: $(LDDIR) $(LDDIR)/$(MACHINE) .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH)
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,13 +1,13 @@
# $Id: Makefile,v 1.3 1993/12/02 07:21:19 mycroft Exp $ # $Id: Makefile,v 1.4 1993/12/05 00:55:03 cgd Exp $
PROG= ldconfig PROG= ldconfig
SRCS= ldconfig.c shlib.c etc.c SRCS= ldconfig.c shlib.c etc.c
LDDIR?= $(.CURDIR)/.. LDDIR?= $(.CURDIR)/..
LDFLAGS += -static LDFLAGS += -static
CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) -O CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) -O
BINDIR= /sbin BINDIR= /sbin
MAN8 = ldconfig.0 MAN8 = ldconfig.0
.PATH: $(LDDIR) $(LDDIR)/$(MACHINE) .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH)
.include <bsd.prog.mk> .include <bsd.prog.mk>