summaryrefslogtreecommitdiff
path: root/gnu/lib/libobjc
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>2001-07-24 19:44:47 +0000
committertv <tv@NetBSD.org>2001-07-24 19:44:47 +0000
commitf6709db6c67199e923533d84ebe7bc1d87ea191a (patch)
tree60874d04ad9652d64b4060a86a365001082ce355 /gnu/lib/libobjc
parentb224b62a84ff74fe13d71090006c26b2aad9a8ba (diff)
Add new toolchain build structure for libg2c, libobjc, and libstdc++.
Note that old build system still exists under .if conditionals; this will be removed once all platforms are using the new toolchain.
Diffstat (limited to 'gnu/lib/libobjc')
-rw-r--r--gnu/lib/libobjc/Makefile50
-rw-r--r--gnu/lib/libobjc/defs.mk4
-rw-r--r--gnu/lib/libobjc/i386.mk6
-rw-r--r--gnu/lib/libobjc/shlib_version4
4 files changed, 58 insertions, 6 deletions
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 9bf343a37a7..561fe7d426b 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,12 +1,52 @@
-# $NetBSD: Makefile,v 1.11 2001/01/09 08:33:46 enami Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/24 19:44:49 tv Exp $
.include <bsd.own.mk>
+LIB= objc
+MKLINT= no
+
+.if defined(USE_NEW_TOOLCHAIN)
+
+# Machine-independent definitions (include file names).
+.include "${.CURDIR}/defs.mk"
+
+# Machine-dependent definitions (object files, -Ds).
+.include "${.CURDIR}/${MACHINE_ARCH}.mk"
+
+TOP= ${.CURDIR}/../..
+DIST= ${TOP}/dist/toolchain
+GCCARCH= ${TOP}/usr.bin/gcc/arch/${MACHINE_ARCH}
+
+SRCS= ${G_OBJS:N[A-Z]*:Nlinking.o:.o=.c} ${G_OBJS:M[A-Z]*:.o=.m} linking.m
+
+GCPPFLAGS= ${G_ALL_CFLAGS} ${G_INCLUDES}
+CPPFLAGS+= -I. -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
+
+INCS= ${G_OBJC_H}
+INCSDIR= /usr/include/objc
+
+DPSRCS+= runtime-info.h
+CLEANFILES+= rtscratch rtscratch.s
+runtime-info.h:
+ @touch rtscratch
+ `${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@
+
+.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc
+
+.include <bsd.lib.mk>
+
+${OBJS}: ${.CURDIR}/${MACHINE_ARCH}.mk runtime-info.h
+
+.else
+#
+# XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
+#
HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
.if (${HAVE_GCC28} != "")
-LIB= objc
+MKPIC=no # XXX hack; shlib_version mismatch
+
SRCS= hash.c sarray.c class.c sendmsg.c init.c archive.c \
encoding.c selector.c objects.c misc.c NXConstStr.m \
Object.m Protocol.m nil_method.c thr.c linking.m \
@@ -32,8 +72,6 @@ ARCHSUBDIR= ${MACHINE_CPU}
CPPFLAGS+= -I. -I${ARCH}/${ARCHSUBDIR} -I${ARCH} \
-I${DIST}/config -I${DIST}
-MKLINT= no
-
CLEANFILES+= rtscratch rtscratch.s
runtime-info.h:
@touch rtscratch
@@ -51,3 +89,7 @@ sendmsg.o sendmsg.so sendmsg.po: runtime-info.h
${TARGETS}:
.endif
+#
+# XXX - END - Old toolchain build goop - delete when everything migrated - XXX
+#
+.endif
diff --git a/gnu/lib/libobjc/defs.mk b/gnu/lib/libobjc/defs.mk
new file mode 100644
index 00000000000..3f9f80da3e0
--- /dev/null
+++ b/gnu/lib/libobjc/defs.mk
@@ -0,0 +1,4 @@
+# This file is automatically generated. DO NOT EDIT!
+# Generated from: NetBSD: toolchain2netbsd,v 1.3 2001/07/24 19:39:52 tv Exp
+#
+G_OBJC_H=hash.h objc-list.h sarray.h objc.h objc-api.h NXConstStr.h Object.h Protocol.h encoding.h typedstream.h thr.h
diff --git a/gnu/lib/libobjc/i386.mk b/gnu/lib/libobjc/i386.mk
new file mode 100644
index 00000000000..cba97690212
--- /dev/null
+++ b/gnu/lib/libobjc/i386.mk
@@ -0,0 +1,6 @@
+# This file is automatically generated. DO NOT EDIT!
+# Generated from: NetBSD: toolchain2netbsd,v 1.3 2001/07/24 19:39:52 tv Exp
+#
+G_ALL_CFLAGS=-I. -I${DIST}/libobjc -g -O2 -DIN_GCC
+G_INCLUDES=-I${DIST}/libobjc/objc -I${DIST}/libobjc/../gcc -I${DIST}/libobjc/../gcc/config -I../../gcc -I${DIST}/libobjc/../include
+G_OBJS=archive.o class.o encoding.o gc.o hash.o init.o linking.o misc.o nil_method.o NXConstStr.o Object.o objects.o Protocol.o sarray.o selector.o sendmsg.o thr.o thr-single.o
diff --git a/gnu/lib/libobjc/shlib_version b/gnu/lib/libobjc/shlib_version
index 6704f6ede39..b0c22bdec71 100644
--- a/gnu/lib/libobjc/shlib_version
+++ b/gnu/lib/libobjc/shlib_version
@@ -1,3 +1,3 @@
-# $NetBSD: shlib_version,v 1.2 1998/08/28 22:38:26 tv Exp $
-major=0
+# $NetBSD: shlib_version,v 1.3 2001/07/24 19:44:49 tv Exp $
+major=1
minor=0