mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
This allows ksh to be compiled with versions of tcc that define __dso_handle in libtcc1.a, i.e., versions as of this commit: https://repo.or.cz/tinycc.git/commit/dd60b20c Older versions of tcc still fail to compile ksh, although now they fail after reaching the libdll feature test. I'm not sure if fixing that is feasible since even if I hack out the failing libdll feature test, ksh fails to link with a '__dso_handle' error. src/lib/libast/comp/atexit.c, src/lib/libast/features/lib, src/lib/libast/vmalloc/vmexit.c: - From what I've been able to gather the only OSes with support for on_exit are Linux and SunOS 4. However, on_exit takes two arguments, so the macro that defines it as taking one argument is incorrect. Since Solaris (SunOS 5) no longer has this call and the macro breaks on Linux, the clean fix is to remove it (atexit(3) is used instead). src/lib/libast/include/ast.h: - When compiling with tcc on FreeBSD, pretend to be gcc 2.95.3 instead of gcc 9.3.0. This stops /usr/include/math.h from activating gcc 3.0+ math compiler builtins that don't exist on tcc, while still identifying as gcc which is needed to avoid other FreeBSD system header breakage. src/cmd/builtin/Mamfile, src/cmd/builtin/features/pty, src/lib/libdll/Mamfile, src/lib/libdll/features/dll: - tcc forbids combining the -c compiler flag with -l* linker flags. Use the -lm flag in the iffe feature tests instead of the Mamfiles. This avoids iffe combining -lm with the -c flag. src/lib/libast/vmalloc/malloc.c: - Fix failure to compile with -D_std_malloc. This patch is from OpenSUSE: https://build.opensuse.org/package/view_file/shells/ksh/ksh93-malloc-hook.dif As it turns out tcc needs this change to build ksh with -D_std_malloc, so it has been applied. Co-authored-by: Martijn Dekker <martijn@inlv.org> Resolves: https://github.com/ksh93/ksh/issues/232
100 lines
2.5 KiB
C
100 lines
2.5 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1985-2011 AT&T Intellectual Property *
|
|
* and is licensed under the *
|
|
* Eclipse Public License, Version 1.0 *
|
|
* by AT&T Intellectual Property *
|
|
* *
|
|
* A copy of the License is available at *
|
|
* http://www.eclipse.org/org/documents/epl-v10.html *
|
|
* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
|
|
* *
|
|
* Information and Software Systems Research *
|
|
* AT&T Research *
|
|
* Florham Park NJ *
|
|
* *
|
|
* Glenn Fowler <gsf@research.att.com> *
|
|
* David Korn <dgk@research.att.com> *
|
|
* Phong Vo <kpv@research.att.com> *
|
|
* *
|
|
***********************************************************************/
|
|
#if defined(_UWIN) && defined(_BLD_ast)
|
|
|
|
void _STUB_vmexit(){}
|
|
|
|
#else
|
|
|
|
#include "vmhdr.h"
|
|
|
|
/*
|
|
** Any required functions for process exiting.
|
|
** Written by Kiem-Phong Vo, kpv@research.att.com (05/25/93).
|
|
*/
|
|
#if _PACKAGE_ast || _lib_atexit
|
|
|
|
void _STUB_vmexit(){}
|
|
|
|
#else
|
|
|
|
#if _lib_onexit
|
|
|
|
#if __STD_C
|
|
int atexit(void (*exitf)(void))
|
|
#else
|
|
int atexit(exitf)
|
|
void (*exitf)();
|
|
#endif
|
|
{
|
|
return onexit(exitf);
|
|
}
|
|
|
|
#else /*!_lib_onexit*/
|
|
|
|
typedef struct _exit_s
|
|
{ struct _exit_s* next;
|
|
void(* exitf)_ARG_((void));
|
|
} Exit_t;
|
|
static Exit_t* Exit;
|
|
|
|
#if __STD_C
|
|
atexit(void (*exitf)(void))
|
|
#else
|
|
atexit(exitf)
|
|
void (*exitf)();
|
|
#endif
|
|
{ Exit_t* e;
|
|
|
|
if(!(e = (Exit_t*)malloc(sizeof(Exit_t))) )
|
|
return -1;
|
|
e->exitf = exitf;
|
|
e->next = Exit;
|
|
Exit = e;
|
|
return 0;
|
|
}
|
|
|
|
#if __STD_C
|
|
void exit(int type)
|
|
#else
|
|
void exit(type)
|
|
int type;
|
|
#endif
|
|
{
|
|
Exit_t* e;
|
|
|
|
for(e = Exit; e; e = e->next)
|
|
(*e->exitf)();
|
|
|
|
#if _exit_cleanup
|
|
_cleanup();
|
|
#endif
|
|
|
|
_exit(type);
|
|
return type;
|
|
}
|
|
|
|
#endif /* _lib_onexit */
|
|
|
|
#endif /*!PACKAGE_ast*/
|
|
|
|
#endif
|