From bbdd1c645c327b0e1e34eece029f38b3ac4142e0 Mon Sep 17 00:00:00 2001 From: jdp Date: Sat, 20 May 2000 17:47:29 +0000 Subject: Take crtbegin.c and crtend.c from the new machine-independent "common" sister directory. --- lib/csu/amd64/Makefile | 2 + lib/csu/i386-elf/Makefile | 2 + lib/csu/i386-elf/crtbegin.c | 102 -------------------------------------------- lib/csu/i386-elf/crtend.c | 33 -------------- 4 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 lib/csu/i386-elf/crtbegin.c delete mode 100644 lib/csu/i386-elf/crtend.c (limited to 'lib/csu') diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index 50686fe..70e66b1 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -13,6 +13,8 @@ NOPIC= true NOPROFILE= true INTERNALLIB= true +.PATH: ${.CURDIR}/../common + all: ${OBJS} ${SOBJS} gcrt1.o: crt1.c diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile index 50686fe..70e66b1 100644 --- a/lib/csu/i386-elf/Makefile +++ b/lib/csu/i386-elf/Makefile @@ -13,6 +13,8 @@ NOPIC= true NOPROFILE= true INTERNALLIB= true +.PATH: ${.CURDIR}/../common + all: ${OBJS} ${SOBJS} gcrt1.o: crt1.c diff --git a/lib/csu/i386-elf/crtbegin.c b/lib/csu/i386-elf/crtbegin.c deleted file mode 100644 index 7693d2b..0000000 --- a/lib/csu/i386-elf/crtbegin.c +++ /dev/null @@ -1,102 +0,0 @@ -/*- - * Copyright 1996, 1997, 1998, 2000 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$ - */ - -#include - -#define ABI_VENDOR "FreeBSD" -#define ABI_SECTION ".note.ABI-tag" -#define ABI_NOTETYPE 1 - -typedef void (*fptr)(void); - -static fptr ctor_list[1] __attribute__((section(".ctors"))) = { (fptr) -1 }; -static fptr dtor_list[1] __attribute__((section(".dtors"))) = { (fptr) -1 }; - -static void -do_ctors(void) -{ - fptr *fpp; - - for(fpp = ctor_list + 1; *fpp != 0; ++fpp) - ; - while(--fpp > ctor_list) - (**fpp)(); -} - -static void -do_dtors(void) -{ - fptr *fpp; - - for(fpp = dtor_list + 1; *fpp != 0; ++fpp) - (**fpp)(); -} - -/* - * With very large programs on some architectures (e.g., the Alpha), - * it is possible to get relocation overflows on the limited - * displacements of call/bsr instructions. 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)(); -} - -/* - * Special ".note" entry specifying the ABI version. See - * http://www.netbsd.org/Documentation/kernel/elf-notes.html - * for more information. - */ -static const struct { - int32_t namesz; - int32_t descsz; - int32_t type; - char name[sizeof ABI_VENDOR]; - int32_t desc; -} abitag __attribute__ ((section (ABI_SECTION))) = { - sizeof ABI_VENDOR, - sizeof(int32_t), - ABI_NOTETYPE, - ABI_VENDOR, - __FreeBSD_version -}; diff --git a/lib/csu/i386-elf/crtend.c b/lib/csu/i386-elf/crtend.c deleted file mode 100644 index 4b33f0c..0000000 --- a/lib/csu/i386-elf/crtend.c +++ /dev/null @@ -1,33 +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$ - */ - -#include - -typedef void (*fptr)(void); - -static fptr ctor_end[1] __attribute__((section(".ctors"))) __unused = { 0 }; -static fptr dtor_end[1] __attribute__((section(".dtors"))) __unused = { 0 }; -- cgit v1.1