Module Name:    src
Committed By:   matt
Date:           Mon Aug  5 13:38:35 UTC 2013

Modified Files:
        src/lib/csu/common: Makefile.inc
Added Files:
        src/lib/csu/arch/alpha: crtfm.c

Log Message:
Alpha needs crtfm.o for USE_COMPILERCRTSTUFF=no


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/alpha/crtfm.c
cvs rdiff -u -r1.15 -r1.16 src/lib/csu/common/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.15 src/lib/csu/common/Makefile.inc:1.16
--- src/lib/csu/common/Makefile.inc:1.15	Thu Jul 18 18:43:56 2013
+++ src/lib/csu/common/Makefile.inc	Mon Aug  5 13:38:35 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.15 2013/07/18 18:43:56 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.16 2013/08/05 13:38:35 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,9 @@ OBJS+=		crtbegin.o crtend.o
 OBJS+=		crtbeginS.o
 CFLAGS.crtbegin.c+= -fPIE
 .endif
+.if ${MACHINE_ARCH} == "alpha"
+OBJS+=		crtfm.o
+.endif
 
 realall: ${OBJS}
 
@@ -82,6 +85,15 @@ gcrt0.o: crt0.S crt0-common.c
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
 
+.if ${MACHINE_ARCH} == "alpha"
+# can't do this in Makefile.inc otherwise it will before realall:
+crtfm.o: crtfm.c
+	${_MKTARGET_COMPILE}
+	${COMPILE.c} ${.ALLSRC} -o ${.TARGET}.o
+	${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	rm -f ${.TARGET}.o
+.endif
+
 sysident_assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
 	${_MKTARGET_CREATE}
 	cat ${COMMON_DIR}/sysident_assym.cf | \

Added files:

Index: src/lib/csu/arch/alpha/crtfm.c
diff -u /dev/null src/lib/csu/arch/alpha/crtfm.c:1.1
--- /dev/null	Mon Aug  5 13:38:35 2013
+++ src/lib/csu/arch/alpha/crtfm.c	Mon Aug  5 13:38:35 2013
@@ -0,0 +1,68 @@
+/*	$NetBSD: crtfm.c,v 1.1 2013/08/05 13:38:35 matt Exp $	*/
+
+/*
+ * Copyright (c) 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed for the NetBSD Project by
+ *	Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Support for the GCC "-ffast-math" option on the Alpha.
+ */
+
+#include <sys/types.h>
+
+#include <machine/fpu.h>
+#include <machine/sysarch.h>
+
+/*
+ * Must provide this wrapper around sysarch(2) so that statically-linked
+ * programs work properly.
+ */
+
+extern void __alpha_sysarch(int, void *);
+
+__asm(".ent __alpha_sysarch 0	;\n"
+"__alpha_sysarch:		;\n"
+"	ldiq	$0, 165		;\n" /* v0 = SYS_sysarch */
+"	call_pal 0x0083		;\n" /* PAL_OSF1_callsys */
+"	ret	$31,($26),1	;\n"
+".end __alpha_sysarch");
+
+static void __attribute__((__constructor__))
+__alpha_set_fast_math(void)
+{
+	struct alpha_fp_c_args args;
+
+	args.fp_c = IEEE_MAP_DMZ|IEEE_MAP_UMZ;
+	__alpha_sysarch(ALPHA_SET_FP_C, &args);
+}

Reply via email to