summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa15
-rw-r--r--sys/arch/hppa/conf/files.hppa28
-rw-r--r--sys/arch/hppa/stand/libkern/Makefile29
3 files changed, 32 insertions, 40 deletions
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 49e5dfc0632..8f841028ab6 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.29 2007/11/25 11:23:33 deraadt Exp $
+# $OpenBSD: Makefile.hppa,v 1.30 2007/11/25 18:25:28 deraadt Exp $
# Makefile for OpenBSD
#
@@ -76,14 +76,6 @@ HOSTED_CFLAGS= ${CFLAGS}
# this line must be there because libkern needs assym.h generated early
depend:: .NOTMAIN .depend
-### find out what to use for libkern
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN= ${KERNLIB}
-.else
-LIBKERN= ${KERNLIB_PROF}
-.endif
-
# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -134,6 +126,9 @@ param.c: $S/conf/param.c
param.o: param.c Makefile
${NORMAL_C}
+mcount.o: $S/lib/libkern/mcount.c Makefile
+ ${NORMAL_C_NOP}
+
ioconf.o: ioconf.c
${NORMAL_C}
@@ -187,9 +182,9 @@ assym.h machdep.o: Makefile
# depend on CPU configuration
locore.o machdep.o trap.o: Makefile
-
locore.o: ${HPPA}/hppa/locore.S assym.h
${NORMAL_S}
+
fpemu.o: assym.h
# The install target can be redefined by putting a
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index 9241d3b5392..e7e836a9cab 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa,v 1.74 2007/10/18 17:39:52 miod Exp $
+# $OpenBSD: files.hppa,v 1.75 2007/11/25 18:25:28 deraadt Exp $
#
# hppa-specific configuration info
@@ -315,3 +315,29 @@ file arch/hppa/hppa/in_cksum.c inet
file netinet/in4_cksum.c inet
file arch/hppa/dev/clock.c
file arch/hppa/hppa/fpemu.S fpemul
+
+# quad support is neccessary for 32 bit architectures
+file lib/libkern/adddi3.c
+file lib/libkern/anddi3.c
+file lib/libkern/ashldi3.c
+file lib/libkern/ashrdi3.c
+file lib/libkern/cmpdi2.c
+file lib/libkern/divdi3.c
+file lib/libkern/iordi3.c
+file lib/libkern/lshldi3.c
+file lib/libkern/lshrdi3.c
+file lib/libkern/moddi3.c
+file lib/libkern/muldi3.c
+file lib/libkern/negdi2.c
+file lib/libkern/notdi2.c
+file lib/libkern/qdivrem.c
+file lib/libkern/subdi3.c
+file lib/libkern/ucmpdi2.c
+file lib/libkern/udivdi3.c
+file lib/libkern/umoddi3.c
+file lib/libkern/xordi3.c
+
+# kern..
+file lib/libkern/arch/hppa/milli.S
+file lib/libkern/arch/hppa/spcopy.S
+
diff --git a/sys/arch/hppa/stand/libkern/Makefile b/sys/arch/hppa/stand/libkern/Makefile
deleted file mode 100644
index 8d7217dd7bd..00000000000
--- a/sys/arch/hppa/stand/libkern/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $OpenBSD: Makefile,v 1.5 2007/05/06 02:48:14 deraadt Exp $
-
-LIB= kern
-
-S= ${.CURDIR}/../../../..
-M= ${KERNDIR}/arch/${MACHINE_ARCH}
-SADIR= ${.CURDIR}/..
-KERNDIR=$S/lib/libkern
-
-NOPIC= nopic
-NOPROFILE= noprofile
-
-.PATH: ${KERNDIR}
-
-.include "arch/hppa/Makefile.inc"
-
-# Quad support
-SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
- lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
- subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-
-# Other stuff
-SRCS+= srandom.c
-
-install:
-
-.include <bsd.lib.mk>
-CPPFLAGS+= ${DEBUGFLAGS}
-CFLAGS+= ${SACFLAGS}