X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=gcc%2Ffixproto;h=7c42d9c77edc31daa834933c7edb82c40ab8b937;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=3d65cbbe9174dd97dc045e165cdd046ac22627e4;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git

diff --git a/gcc/fixproto b/gcc/fixproto
index 3d65cbbe..7c42d9c7 100755
--- a/gcc/fixproto
+++ b/gcc/fixproto
@@ -4,12 +4,13 @@
 #	fixproto TARGET-DIR SOURCE-DIR-ALL SOURCE-DIR-STD
 #
 # COPYRIGHT
-#	Copyright (C) 1993, 1994, 1997, 1998 Free Software Foundation, Inc.
+#	Copyright (C) 1993, 1994, 1997, 1998, 2002, 2003, 2007, 2008
+#       Free Software Foundation, Inc.
 #	This file is part of GCC.
 #
 #	GCC is free software; you can redistribute it and/or modify
 #	it under the terms of the GNU General Public License as published by
-#	the Free Software Foundation; either version 2, or (at your option)
+#	the Free Software Foundation; either version 3, or (at your option)
 #	any later version.
 #
 #	GCC is distributed in the hope that it will be useful,
@@ -18,9 +19,8 @@
 #	GNU General Public License for more details.
 #
 #	You should have received a copy of the GNU General Public License
-#	along with GCC; see the file COPYING.  If not, write to
-#	the Free Software Foundation, 59 Temple Place - Suite 330,
-#	Boston, MA 02111-1307, USA.
+#	along with GCC; see the file COPYING3.  If not see
+#	<http://www.gnu.org/licenses/>.
 #
 # DESCRIPTION
 #	Adjunct script for GCC to populate a directory with ANSI,
@@ -56,7 +56,7 @@
 
 dirname=`echo "$0" | sed 's,^[^/]*$,.,;s,//*[^/]*$,,'`
 progname=`echo "$0" | sed 's,.*/,,'`
-original_dir=`pwd`
+original_dir=`${PWDCMD-pwd}`
 FIX_HEADER=${FIX_HEADER-$original_dir/fix-header}
 DEFINES="-D__STDC__=0 -D__cplusplus ${FIXPROTO_DEFINES}"
 
@@ -133,13 +133,6 @@ if [ `echo $* | wc -w` != 0 ] ; then
   done
 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=""
 subdirs_made=""
 echo "" >fixproto.list
@@ -204,7 +197,7 @@ for code in ALL STD ; do
 	fi
       fi
       # Append "/"; remove initial "./". Hence "." -> "" and "sys" -> "sys/".
-      rel_source_prefix=`echo $rel_source_subdir | sed -e 's|$|/|' -e 's|^./||'`
+      rel_source_prefix=`echo $rel_source_subdir | sed -e 's|$|/|' -e 's|^\./||'`
 
       case $code in
 	ALL)
@@ -283,35 +276,57 @@ done
 
 # This might be more cleanly moved into the main loop, by adding
 # a <dummy> source directory at the end.  FIXME!
-for rel_source_file in unistd.h stdlib.h
-do
-  if grep "$rel_source_file" fixproto.list >/dev/null
-  then true
+
+# All the headers we create define size_t and NULL.
+for rel_source_file in unistd.h stdlib.h string.h time.h ; do
+  if grep "$rel_source_file" fixproto.list >/dev/null ; then
+    : # It exists, we don't need to make it
   else
     echo Adding missing $rel_source_file
     rel_source_ident=`echo $rel_source_file | tr ./ __`
-    required_list=`eval echo '${required_'${rel_source_ident}'-}'`
     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}
 #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
 #include <stddef.h>
 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
 
 #endif /* __${rel_source_ident} */
 EOF
     ${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 -f $abs_target_dir/$rel_source_file
-    then
+    if test -f $abs_target_dir/$rel_source_file ; then
       rm tmp.h
     else
       mv tmp.h $abs_target_dir/$rel_source_file