summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile6
-rw-r--r--gnu/usr.bin/cc/include/Makefile7
-rw-r--r--gnu/usr.bin/cc/libgcc/Makefile8
3 files changed, 11 insertions, 10 deletions
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 49524e78812..5f78a6afa20 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.2 2009/11/02 09:50:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2009/11/17 18:53:43 robert Exp $
.include <bsd.own.mk>
@@ -45,7 +45,9 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h
.endif
.endif
.if ${TARGET_ARCH} == "amd64"
-TARgET_INC+= ${GCC_CPU}/x86-64.h
+TARGET_INC+= ${GCC_CPU}/x86-64.h
+TARGET_INC+= ${GCC_CPU}/openbsd64.h
+.elif ${TARGET_ARCH} == "sparc64"
TARGET_INC+= ${GCC_CPU}/openbsd64.h
.else
TARGET_INC+= ${GCC_CPU}/openbsdelf.h
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index ee1bc7c945b..cd59b51f33f 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1 2009/10/15 20:50:20 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2009/11/17 18:53:43 robert Exp $
.include <bsd.own.mk>
@@ -29,8 +29,13 @@ clean: _SUBDIRUSE
depend:
# Nothing here so far...
+.if ${TARGET_ARCH} != "sparc64"
install: ${INCS}
${INSTALL} -C -o ${BINOWN} -g ${LOCALEGRP} -m ${NONBINMODE} ${.ALLSRC} \
${DESTDIR}/usr/include
+.else
+install:
+ # Nothing here so far...
+.endif
.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 5896b4c4558..12d280fabb9 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.1 2009/10/15 20:50:19 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2009/11/17 18:53:43 robert Exp $
.include <bsd.own.mk>
@@ -122,12 +122,6 @@ LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c
LIB2FUNCS_STATIC_EXTRA = eabi.asm
.endif
-.if ${TARGET_ARCH} == "sparc64"
-# from config/sparc/t-elf
-LIB1ASMSRC = lb1spc.asm
-LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
-.endif
-
#-----------------------------------------------------------------------
# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are