diff options
author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-12-01 17:18:32 +0000 |
---|---|---|
committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-12-01 17:18:32 +0000 |
commit | 81f70a2c11c6dd3cfbdc8b3a75201127bbef3b0f (patch) | |
tree | 1232ad078f51a8eab45f49f3498c1913d4fbe753 /lib | |
parent | 342ef407b88242890ae7f69c1c8e771bf72bdf64 (diff) |
mips64 no longer uses scrt0.o, and it was identical to crt0.o anyway.
Delete unused #ifndef SCRT0 conditionals.
ok miod@
Diffstat (limited to 'lib')
-rw-r--r-- | lib/csu/arm/crt0.c | 4 | ||||
-rw-r--r-- | lib/csu/mips64/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/powerpc/crt0.c | 4 | ||||
-rw-r--r-- | lib/csu/sh/crt0.c | 4 |
4 files changed, 5 insertions, 17 deletions
diff --git a/lib/csu/arm/crt0.c b/lib/csu/arm/crt0.c index b451a76cc32..c66511a202c 100644 --- a/lib/csu/arm/crt0.c +++ b/lib/csu/arm/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.4 2013/11/10 19:44:17 guenther Exp $ */ +/* $OpenBSD: crt0.c,v 1.5 2013/12/01 17:18:30 guenther Exp $ */ /* $NetBSD: crt0.c,v 1.6 2002/01/01 01:31:06 thorpej Exp $ */ /* @@ -107,9 +107,7 @@ ___start(int argc, char **argv, char **envp, void (*cleanup)(void)) monstartup((u_long)&_eprol, (u_long)&_etext); #endif /* MCRT0 */ -#ifndef SCRT0 __init(); -#endif __asm("__callmain:"); /* Defined for the benefit of debuggers */ exit(main(argc, argv, envp)); diff --git a/lib/csu/mips64/Makefile b/lib/csu/mips64/Makefile index 049b75a25c6..4af9c83fa2d 100644 --- a/lib/csu/mips64/Makefile +++ b/lib/csu/mips64/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2011/11/08 10:37:09 guenther Exp $ +# $OpenBSD: Makefile,v 1.4 2013/12/01 17:18:31 guenther Exp $ #CFLAGS+= -I${.CURDIR} -mips2 CFLAGS+= -I${.CURDIR} -OBJS= crt0.o gcrt0.o scrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o +OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o .PATH: ${.CURDIR}/../common_elf @@ -20,12 +20,6 @@ gcrt0.o: crt0.c ${DEPS} @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o -scrt0.o: crt0.c ${DEPS} - @echo "${CC} -DSCRT0 -c ${.ALLSRC} -o ${.TARGET}" - @${CC} -DSCRT0 -c ${.ALLSRC} -o ${.TARGET}.o - @${LD} -x -r ${.TARGET}.o -o ${.TARGET} - @rm -f ${.TARGET}.o - realinstall: ${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \ ${DESTDIR}/usr/lib diff --git a/lib/csu/powerpc/crt0.c b/lib/csu/powerpc/crt0.c index 4239ea26f89..a1fcde53b89 100644 --- a/lib/csu/powerpc/crt0.c +++ b/lib/csu/powerpc/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.7 2012/12/31 10:07:51 miod Exp $ */ +/* $OpenBSD: crt0.c,v 1.8 2013/12/01 17:18:31 guenther Exp $ */ /* $NetBSD: crt0.c,v 1.1 1996/09/12 16:59:02 cgd Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou @@ -159,9 +159,7 @@ ___start(int argc, char **argv, char **envp, void *aux, void (*cleanup)(void)) monstartup((u_long)&_eprol, (u_long)&_etext); #endif -#ifndef SCRT0 __init(); -#endif exit(main(argc, argv, environ)); } diff --git a/lib/csu/sh/crt0.c b/lib/csu/sh/crt0.c index 3cd9d59d356..0f547a3a1d0 100644 --- a/lib/csu/sh/crt0.c +++ b/lib/csu/sh/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.6 2013/11/10 19:30:40 guenther Exp $ */ +/* $OpenBSD: crt0.c,v 1.7 2013/12/01 17:18:31 guenther Exp $ */ /* $NetBSD: crt0.c,v 1.10 2004/08/26 21:16:41 thorpej Exp $ */ /* @@ -97,9 +97,7 @@ __start(int argc, char **argv, char **envp, void (*cleanup)(void)) monstartup((u_long)&_eprol, (u_long)&_etext); #endif /* MCRT0 */ -#ifndef SCRT0 __init(); -#endif __asm("__callmain:"); /* Defined for the benefit of debuggers */ exit(main(argc, argv, envp)); |