Commit cbbf876b by Nathanael Nerode

fixproto: Define NULL and size_t in generated stdlib.h and unistd.h.

	* fixproto: Define NULL and size_t in generated stdlib.h and
	unistd.h.  Kill unused required_stdlib_h, required_unistd_h.
	Rearrange file generation loop for readability.  Generate time.h,
	string.h if missing.
	* tsystem.h: Include <string.h>, <time.h> unconditionally.
	* config.gcc: Blow away POSIX defines.

From-SVN: r64690
parent 84fcbe0a
2003-03-21 Nathanael Nerode <neroden@gcc.gnu.org>
* fixproto: Define NULL and size_t in generated stdlib.h and
unistd.h. Kill unused required_stdlib_h, required_unistd_h.
Rearrange file generation loop for readability. Generate time.h,
string.h if missing.
* tsystem.h: Include <string.h>, <time.h> unconditionally.
* config.gcc: Blow away POSIX defines.
2003-03-22 Stephane Carrez <stcarrez@nerim.fr> 2003-03-22 Stephane Carrez <stcarrez@nerim.fr>
* config/m68hc11/m68hc11.md ("call_value"): Fix trap check. * config/m68hc11/m68hc11.md ("call_value"): Fix trap check.
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
# fixproto TARGET-DIR SOURCE-DIR-ALL SOURCE-DIR-STD # fixproto TARGET-DIR SOURCE-DIR-ALL SOURCE-DIR-STD
# #
# COPYRIGHT # COPYRIGHT
# Copyright (C) 1993, 1994, 1997, 1998, 2002 Free Software Foundation, Inc. # Copyright (C) 1993, 1994, 1997, 1998, 2002, 2003
# Free Software Foundation, Inc.
# This file is part of GCC. # This file is part of GCC.
# #
# GCC is free software; you can redistribute it and/or modify # GCC is free software; you can redistribute it and/or modify
...@@ -133,13 +134,6 @@ if [ `echo $* | wc -w` != 0 ] ; then ...@@ -133,13 +134,6 @@ if [ `echo $* | wc -w` != 0 ] ; then
done done
fi fi
required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc putenv qsort rand realloc srand strtod strtol strtoul system"
# "div ldiv", - ignored because these depend on div_t, ldiv_t
# ignore these: "mblen mbstowcs mbstowc wcstombs wctomb"
# Left out getgroups, because SunOS4 has incompatible BSD and SVR4 versions.
# Should perhaps also add NULL
required_unistd_h="_exit access alarm chdir chown close ctermid cuserid dup dup2 execl execle execlp execv execve execvp fork fpathconf getcwd getegid geteuid getgid getlogin getopt getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
done_dirs="" done_dirs=""
subdirs_made="" subdirs_made=""
echo "" >fixproto.list echo "" >fixproto.list
...@@ -283,35 +277,57 @@ done ...@@ -283,35 +277,57 @@ done
# This might be more cleanly moved into the main loop, by adding # This might be more cleanly moved into the main loop, by adding
# a <dummy> source directory at the end. FIXME! # a <dummy> source directory at the end. FIXME!
for rel_source_file in unistd.h stdlib.h
do # All the headers we create define size_t and NULL.
if grep "$rel_source_file" fixproto.list >/dev/null for rel_source_file in unistd.h stdlib.h string.h time.h ; do
then true if grep "$rel_source_file" fixproto.list >/dev/null ; then
: # It exists, we don't need to make it
else else
echo Adding missing $rel_source_file echo Adding missing $rel_source_file
rel_source_ident=`echo $rel_source_file | tr ./ __` rel_source_ident=`echo $rel_source_file | tr ./ __`
required_list=`eval echo '${required_'${rel_source_ident}'-}'`
cat >tmp.h <<EOF cat >tmp.h <<EOF
/* Fake ${rel_source_file}, created by GCC.
The functions declared in this file do not necessarily exist in
your C library. */
#ifndef __${rel_source_ident} #ifndef __${rel_source_ident}
#define __${rel_source_ident} #define __${rel_source_ident}
EOF
if test $rel_source_file = stdlib.h
then
# Make sure it contains a definition of size_t.
cat >>tmp.h <<EOF
#define __need_NULL
#define __need_size_t #define __need_size_t
#include <stddef.h> #include <stddef.h>
EOF EOF
fi # Insert special stuff for particular files here.
case ${rel_source_file} in
time.h)
# If time.h doesn't exist, find out if sys/time.h does.
if test -f $src_dir_std/sys/time.h \
|| grep "sys/time.h" fixproto.list >/dev/null ; then
# It does; include it and hope it has the needed declarations.
# Some versions require sys/types.h.
cat >>tmp.h <<EOF
#include <sys/types.h>
#include <sys/time.h>
EOF
else
# It doesn't. Make up plausible definitions for time_t, clock_t.
# Forward-declare struct tm. Hope nobody tries to use it. (Odds
# are they won't.)
cat >>tmp.h <<EOF
typedef long time_t;
typedef long clock_t;
struct tm;
EOF
fi ;;
esac
cat >>tmp.h <<EOF cat >>tmp.h <<EOF
#endif /* __${rel_source_ident} */ #endif /* __${rel_source_ident} */
EOF EOF
${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path ${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path
if test $? != 0 ; then exit 1 ; fi if test $? != 0 ; then exit 1 ; fi
if test -f $abs_target_dir/$rel_source_file if test -f $abs_target_dir/$rel_source_file ; then
then
rm tmp.h rm tmp.h
else else
mv tmp.h $abs_target_dir/$rel_source_file mv tmp.h $abs_target_dir/$rel_source_file
......
...@@ -73,20 +73,16 @@ extern int atexit (void (*)(void)); ...@@ -73,20 +73,16 @@ extern int atexit (void (*)(void));
extern int errno; extern int errno;
#endif #endif
#ifdef POSIX
#include <string.h>
#endif
/* GCC (fixproto) guarantees these system headers exist. */ /* GCC (fixproto) guarantees these system headers exist. */
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
/* GCC supplies this header. */ /* GCC supplies this header. */
#include <limits.h> #include <limits.h>
#ifdef POSIX /* GCC (fixproto) guarantees this system headers exists. */
#include <time.h> #include <time.h>
#endif
#endif /* inhibit_libc */ #endif /* inhibit_libc */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment