Rip out the old __stdin/out/err stuff. It was completely 100% useless. :-(
It was foiled because of dynamic copy relocations that caused compile-time space to be reserved in .bss and at run time a blob of data was copied to that space and everything used the .bss version.. The problem is that the space is reserved at compile time, not runtime... So we *still* could not change the size of FILE. Sigh. :-( Replace it with something that does actually work and really does let us make 'FILE' extendable. It also happens to be the same as Linux does in glibc, but has the slight cost of a pointer. Note that this is the same cost that 'fp = fopen(), fprintf(fp, ...); fclose(fp);' has. Fortunately, actual references to stdin/out/err are not all that common since we have implicit stdin/out/err-using versions of functions (printf() vs. fprintf()).
This commit is contained in:
parent
d55229b72e
commit
2b618987fe
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=81600
@ -132,6 +132,9 @@ typedef struct __sFILE {
|
|||||||
|
|
||||||
__BEGIN_DECLS
|
__BEGIN_DECLS
|
||||||
extern FILE __sF[];
|
extern FILE __sF[];
|
||||||
|
extern FILE *__stdinp;
|
||||||
|
extern FILE *__stdoutp;
|
||||||
|
extern FILE *__stderrp;
|
||||||
__END_DECLS
|
__END_DECLS
|
||||||
|
|
||||||
#define __SLBF 0x0001 /* line buffered */
|
#define __SLBF 0x0001 /* line buffered */
|
||||||
@ -194,9 +197,16 @@ __END_DECLS
|
|||||||
#define SEEK_END 2 /* set file offset to EOF plus offset */
|
#define SEEK_END 2 /* set file offset to EOF plus offset */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* To be removed by 5.0-RELEASE */
|
||||||
|
#if (defined(__i386__) || defined(__alpha__)) && !defined(_FIXED_STDIO)
|
||||||
#define stdin (&__sF[0])
|
#define stdin (&__sF[0])
|
||||||
#define stdout (&__sF[1])
|
#define stdout (&__sF[1])
|
||||||
#define stderr (&__sF[2])
|
#define stderr (&__sF[2])
|
||||||
|
#else
|
||||||
|
#define stdin __stdinp
|
||||||
|
#define stdout __stdoutp
|
||||||
|
#define stderr __stderrp
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Functions defined in ANSI C standard.
|
* Functions defined in ANSI C standard.
|
||||||
|
@ -9,7 +9,8 @@
|
|||||||
LIB=c
|
LIB=c
|
||||||
SHLIB_MAJOR= 5
|
SHLIB_MAJOR= 5
|
||||||
SHLIB_MINOR= 0
|
SHLIB_MINOR= 0
|
||||||
CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/include
|
CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/include -I${.CURDIR}/../../include
|
||||||
|
CFLAGS+=-DLIBC_MAJOR=${SHLIB_MAJOR}
|
||||||
AINC= -I${.CURDIR}/${MACHINE_ARCH}
|
AINC= -I${.CURDIR}/${MACHINE_ARCH}
|
||||||
CLEANFILES+=tags
|
CLEANFILES+=tags
|
||||||
INSTALL_PIC_ARCHIVE= yes
|
INSTALL_PIC_ARCHIVE= yes
|
||||||
|
@ -71,6 +71,9 @@ static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
|
|||||||
|
|
||||||
static struct __sFILEX __sFX[3];
|
static struct __sFILEX __sFX[3];
|
||||||
|
|
||||||
|
#if LIBC_MAJOR >= 6
|
||||||
|
static
|
||||||
|
#endif
|
||||||
FILE __sF[3] = {
|
FILE __sF[3] = {
|
||||||
std(__SRD, STDIN_FILENO),
|
std(__SRD, STDIN_FILENO),
|
||||||
std(__SWR, STDOUT_FILENO),
|
std(__SWR, STDOUT_FILENO),
|
||||||
@ -84,18 +87,9 @@ FILE __sF[3] = {
|
|||||||
* symbols and expects libc to provide them. We only have need to support
|
* symbols and expects libc to provide them. We only have need to support
|
||||||
* i386 and alpha because they are the only "old" systems we have deployed.
|
* i386 and alpha because they are the only "old" systems we have deployed.
|
||||||
*/
|
*/
|
||||||
#if defined(__i386__)
|
FILE *__stdinp = &__sF[0];
|
||||||
#define FILE_SIZE 88
|
FILE *__stdoutp = &__sF[1];
|
||||||
#elif defined(__alpha__)
|
FILE *__stderrp = &__sF[2];
|
||||||
#define FILE_SIZE 152
|
|
||||||
#endif
|
|
||||||
#ifndef FILE_SIZE
|
|
||||||
#error "You must define FILE_SIZE for this platform"
|
|
||||||
#endif
|
|
||||||
#define X(loc, sym) __strong_reference(loc, sym)
|
|
||||||
X(__sF + FILE_SIZE * 0, __stdin);
|
|
||||||
X(__sF + FILE_SIZE * 1, __stdout);
|
|
||||||
X(__sF + FILE_SIZE * 2, __stderr);
|
|
||||||
|
|
||||||
struct glue __sglue = { &uglue, 3, __sF };
|
struct glue __sglue = { &uglue, 3, __sF };
|
||||||
static struct glue *lastglue = &uglue;
|
static struct glue *lastglue = &uglue;
|
||||||
@ -233,14 +227,11 @@ _cleanup()
|
|||||||
/*
|
/*
|
||||||
* __sinit() is called whenever stdio's internal variables must be set up.
|
* __sinit() is called whenever stdio's internal variables must be set up.
|
||||||
*/
|
*/
|
||||||
#define SIZEMSG "WARNING: FILE_SIZE != sizeof(FILE)\n"
|
|
||||||
void
|
void
|
||||||
__sinit()
|
__sinit()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (FILE_SIZE != sizeof(FILE))
|
|
||||||
write(2, SIZEMSG, sizeof(SIZEMSG) - 1);
|
|
||||||
THREAD_LOCK();
|
THREAD_LOCK();
|
||||||
if (__sdidinit == 0) {
|
if (__sdidinit == 0) {
|
||||||
/* Set _extra for the usual suspects. */
|
/* Set _extra for the usual suspects. */
|
||||||
|
Loading…
Reference in New Issue
Block a user