From Jordan via. Paul K.
This fixes the problems Warner's having with ctors not being called again with the latest round of ld changes and updates the file-names to what Paul is using now. The name change will not affect anything as we are not (yet) using it.
This commit is contained in:
parent
5bebac3224
commit
f2523a7e72
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=1253
@ -1,8 +1,8 @@
|
|||||||
# from: @(#)Makefile 5.6 (Berkeley) 5/22/91
|
# from: @(#)Makefile 5.6 (Berkeley) 5/22/91
|
||||||
# $Id: Makefile,v 1.7 1993/11/18 00:08:03 ache Exp $
|
# $Id: Makefile,v 1.8 1993/12/24 02:11:37 jkh Exp $
|
||||||
|
|
||||||
CFLAGS+= -DLIBC_SCCS -DDYNAMIC
|
CFLAGS+= -DLIBC_SCCS -DDYNAMIC
|
||||||
OBJS= crt0.o gcrt0.o crt1.so
|
OBJS= crt0.o gcrt0.o c++rt0.o
|
||||||
CLEANFILES+= gmon.o moncrt0.o core a.out
|
CLEANFILES+= gmon.o moncrt0.o core a.out
|
||||||
|
|
||||||
all: ${OBJS}
|
all: ${OBJS}
|
||||||
@ -12,9 +12,9 @@ crt0.o: crt0.c
|
|||||||
${LD} -x -r ${.TARGET}
|
${LD} -x -r ${.TARGET}
|
||||||
mv a.out ${.TARGET}
|
mv a.out ${.TARGET}
|
||||||
|
|
||||||
crt1.so: crt1.c
|
c++rt0.o: c++rt0.c
|
||||||
${CC} ${CFLAGS} -fpic -c ${.ALLSRC} -o ${.TARGET}
|
${CC} ${CFLAGS} -fpic -c ${.ALLSRC}
|
||||||
${LD} -X -r ${.TARGET}
|
@${LD} -x -r ${.TARGET}
|
||||||
@mv a.out ${.TARGET}
|
@mv a.out ${.TARGET}
|
||||||
|
|
||||||
moncrt0.o: crt0.c
|
moncrt0.o: crt0.c
|
||||||
|
80
lib/csu/i386/c++rt0.c
Normal file
80
lib/csu/i386/c++rt0.c
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 1993 Paul Kranenburg
|
||||||
|
* 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.
|
||||||
|
* 3. All advertising materials mentioning features or use of this software
|
||||||
|
* must display the following acknowledgement:
|
||||||
|
* This product includes software developed by Paul Kranenburg.
|
||||||
|
* 4. The name of the author may not be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* $Id: c++rt0.c,v 1.2 1994/01/29 01:58:31 jtc Exp $
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Run-time module for GNU C++ compiled shared libraries.
|
||||||
|
*
|
||||||
|
* The linker constructs the following arrays of pointers to global
|
||||||
|
* constructors and destructors. The first element contains the
|
||||||
|
* number of pointers in each.
|
||||||
|
* The tables are also null-terminated.
|
||||||
|
*/
|
||||||
|
void (*__CTOR_LIST__[0])(void);
|
||||||
|
void (*__DTOR_LIST__[0])(void);
|
||||||
|
|
||||||
|
static void
|
||||||
|
__dtors(void)
|
||||||
|
{
|
||||||
|
unsigned long i = (unsigned long) __DTOR_LIST__[0];
|
||||||
|
void (**p)(void) = __DTOR_LIST__ + i;
|
||||||
|
|
||||||
|
while (i--)
|
||||||
|
(**p--)();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
__ctors(void)
|
||||||
|
{
|
||||||
|
void (**p)(void) = __CTOR_LIST__ + 1;
|
||||||
|
|
||||||
|
while (*p)
|
||||||
|
(**p++)();
|
||||||
|
}
|
||||||
|
|
||||||
|
extern void __init() asm(".init");
|
||||||
|
|
||||||
|
void
|
||||||
|
__init(void)
|
||||||
|
{
|
||||||
|
static int initialized = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Call global constructors.
|
||||||
|
* Arrange to call global destructors at exit.
|
||||||
|
*/
|
||||||
|
if (!initialized) {
|
||||||
|
initialized = 1;
|
||||||
|
__ctors();
|
||||||
|
atexit(__dtors);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user