From d00f222c77a8ab0c3c81f9d60defbbec4eb69be7 Mon Sep 17 00:00:00 2001 From: jdp Date: Tue, 23 May 2000 04:53:24 +0000 Subject: Use the new machine-independent versions of crtbegin and crtend from the "common" directory. As a side-effect, this also fixes a bug in the ordering of global constructors and destructors on the Alpha. See revision 1.3 of "../common/crtbegin.c" for details. --- lib/csu/alpha/Makefile | 2 ++ lib/csu/alpha/crtbegin.c | 77 ------------------------------------------------ lib/csu/alpha/crtend.c | 31 ------------------- 3 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 lib/csu/alpha/crtbegin.c delete mode 100644 lib/csu/alpha/crtend.c (limited to 'lib/csu') diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile index ffd5350..d215568 100644 --- a/lib/csu/alpha/Makefile +++ b/lib/csu/alpha/Makefile @@ -12,6 +12,8 @@ NOPIC= true NOPROFILE= true INTERNALLIB= true +.PATH: ${.CURDIR}/../common + all: ${OBJS} ${SOBJS} gcrt1.o: crt1.c diff --git a/lib/csu/alpha/crtbegin.c b/lib/csu/alpha/crtbegin.c deleted file mode 100644 index 4cb2903..0000000 --- a/lib/csu/alpha/crtbegin.c +++ /dev/null @@ -1,77 +0,0 @@ -/*- - * Copyright 1996-1998 John D. Polstra. - * All rights reserved. - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. - * - * $FreeBSD$ - */ - -typedef void (*fptr)(void); - -static fptr ctor_list[1] __attribute__((section(".ctors"))) = { (fptr) -1 }; -static fptr dtor_list[1] __attribute__((section(".dtors"))) = { (fptr) -1 }; - -/* Both do_ctors() and do_dtors() live in .text (the default) */ -static void -do_ctors(void) -{ - fptr *fpp; - - for(fpp = ctor_list + 1; *fpp != 0; ++fpp) - (**fpp)(); -} - -static void -do_dtors(void) -{ - fptr *fpp; - - for(fpp = dtor_list + 1; *fpp != 0; ++fpp) - ; - while(--fpp > dtor_list) - (**fpp)(); -} - -/* - * On very large programs, it is possible to get a relocation overflow - * of the 21-bit BSR displacements. It is particularly likely for the - * calls from _init() and _fini(), because they are in separate sections. - * Avoid the problem by forcing indirect calls. - */ -static void (*p_do_ctors)(void) = do_ctors; -static void (*p_do_dtors)(void) = do_dtors; - -extern void _init(void) __attribute__((section(".init"))); - -void -_init(void) -{ - (*p_do_ctors)(); -} - -extern void _fini(void) __attribute__((section(".fini"))); - -void -_fini(void) -{ - (*p_do_dtors)(); -} diff --git a/lib/csu/alpha/crtend.c b/lib/csu/alpha/crtend.c deleted file mode 100644 index d6228a3..0000000 --- a/lib/csu/alpha/crtend.c +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * Copyright 1996-1998 John D. Polstra. - * All rights reserved. - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. - * - * $FreeBSD$ - */ - -typedef void (*fptr)(void); - -static fptr ctor_end[1] __attribute__((section(".ctors"))) = { 0 }; -static fptr dtor_end[1] __attribute__((section(".dtors"))) = { 0 }; -- cgit v1.1