Remove BOGOSITY code, and Remove code for installing "shell" version
From-SVN: r33669
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cfa5997..60153d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -4,6 +4,8 @@
Remove `extern double cabs' declarations from math.h
* fixincl/inclhack.sh: regen
* fixincl/fixincl.x: regen
+ * fixincl/fixincl.c: Remove BOGOSITY code
+ * fixincl/mkfixinc.sh: Remove code for installing "shell" version
Thu May 4 09:45:12 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index a43ae3b..d693682 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -33,13 +33,6 @@
#include "server.h"
-#define NO_BOGOSITY
-
-/* Quality Assurance Marker :-)
-
- Any file that contains this string is presumed to have
- been carefully constructed and will not be fixed */
-
/* The contents of this string are not very important. It is mostly
just used as part of the "I am alive and working" test. */
@@ -244,33 +237,7 @@
continue;
*pz_end = NUL;
-#ifdef NO_BOGOSITY
process ();
-#else
- /* Prevent duplicate output by child process */
-
- fflush (stdout);
- fflush (stderr);
-
- {
- void wait_for_pid _P_(( pid_t ));
- pid_t child = fork ();
- if (child == NULLPROCESS)
- {
- process ();
- return EXIT_SUCCESS;
- }
-
- if (child == NOPROCESS)
- {
- fprintf (stderr, "Error %d (%s) forking in main\n",
- errno, xstrerror (errno));
- exit (EXIT_FAILURE);
- }
-
- wait_for_pid( child );
- }
-#endif
} /* for (;;) */
#ifdef DO_STATS
@@ -302,7 +269,7 @@
*/
run_compiles ();
sprintf (zBuf, zFmt, program_id);
- fputs (zBuf + 5, stdout);
+ puts (zBuf + 5);
exit (strcmp (run_shell (zBuf), program_id));
}
@@ -405,76 +372,8 @@
signal (SIGPIPE, SIG_IGN);
signal (SIGALRM, SIG_IGN);
signal (SIGTERM, SIG_IGN);
-#ifndef NO_BOGOSITY
- /*
- Make sure that if we opened a server process, we close it now.
- This is the grandparent process. We don't need the server anymore
- and our children should make their own. */
-
- close_server ();
- (void)wait ( (int*)NULL );
-#endif
}
-#ifndef NO_BOGOSITY
-/* * * * * * * * * * * * *
-
- wait_for_pid - Keep calling `wait(2)' until it returns
- the process id we are looking for. Not every system has
- `waitpid(2)'. We also ensure that the children exit with success. */
-
-void
-wait_for_pid(child)
- pid_t child;
-{
- for (;;) {
- int status;
- pid_t dead_kid = wait (&status);
-
- if (dead_kid == child)
- {
- if (! WIFEXITED( status ))
- {
- if (WSTOPSIG( status ) == 0)
- break;
-
- fprintf (stderr, "child process %d is hung on signal %d\n",
- child, WSTOPSIG( status ));
- exit (EXIT_FAILURE);
- }
- if (WEXITSTATUS( status ) != 0)
- {
- fprintf (stderr, "child process %d exited with status %d\n",
- child, WEXITSTATUS( status ));
- exit (EXIT_FAILURE);
- }
- break; /* normal child completion */
- }
-
- /*
- IF there is an error, THEN see if it is retryable.
- If it is not retryable, then break out of this loop. */
- if (dead_kid == NOPROCESS)
- {
- switch (errno) {
- case EINTR:
- case EAGAIN:
- break;
-
- default:
- if (NOT_SILENT)
- fprintf (stderr, "Error %d (%s) waiting for %d to finish\n",
- errno, xstrerror( errno ), child );
- /* FALLTHROUGH */
-
- case ECHILD: /* no children to wait for?? */
- return;
- }
- }
- } done_waiting:;
-}
-#endif /* NO_BOGOSITY */
-
/* * * * * * * * * * * * *
load_file loads all the contents of a file into malloc-ed memory.
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index ead6b15..62fff11 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -121,7 +121,4 @@
# make and install either the binary or the default script
#
-$MAKE SHELL="$SHELL" install-bin && exit 0
-
-echo $MAKE SHELL=\"$SHELL\" install-sh
-$MAKE SHELL="$SHELL" install-sh
+$MAKE SHELL="$SHELL" install-bin