From d940655c6b2fef56c04a48304c7018782de0fcf0 Mon Sep 17 00:00:00 2001
From: korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 1 Nov 1999 18:14:50 +0000
Subject: [PATCH] Patch from Philippe De Muyter <phdm@macqel.be>
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30322 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 9 +++++++++
gcc/fixinc/fixfixes.c | 6 +++---
gcc/fixinc/fixincl.c | 13 ++++++-------
gcc/fixinc/fixtests.c | 6 +++---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa08e92c8be1..8bd945a25b17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -8,6 +8,15 @@ Mon Nov 1 08:03:15 1999 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* regclass.c (record_reg_classes): In matching case, recompute
costs since the direction of movement is different.
+Sun Oct 31 15:48:49 1999 Philippe De Muyter <phdm@macqel.be>
+
+ * fixinc/fixtests.c, fixinc/fixfixes.c : Keep `#' in first column for
+ old cpp's.
+ * fixinc/fixincl.c (fcntl.h) : Do not include this file twice.
+ (sys/mman.h): Include this file only if #HAVE_MMAP.
+ (run_compiles): Initialize `esac_fmt' with one old KR string, not
+ with automatically concatenated ANSI strings.
+
Sun Oct 31 23:57:07 1999 Mark Mitchell <mark@codesourcery.com>
* ggc-page.c (struct page_entry): Remove save_num_free_objects.
diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c
index c1586e8cfb7c..737bc5bc6086 100644
--- a/gcc/fixinc/fixfixes.c
+++ b/gcc/fixinc/fixfixes.c
@@ -371,10 +371,10 @@ apply_fix( fixname, filname )
const char* fixname;
const char* filname;
{
- #define _FT_(n,p) { n, p },
+#define _FT_(n,p) { n, p },
static fix_entry_t fix_table[] = { FIXUP_TABLE { NULL, NULL }};
- #undef _FT_
- #define FIX_TABLE_CT ((sizeof(fix_table)/sizeof(fix_table[0]))-1)
+#undef _FT_
+#define FIX_TABLE_CT ((sizeof(fix_table)/sizeof(fix_table[0]))-1)
char* buf;
int ct = FIX_TABLE_CT;
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 1e7c1261900f..6a143fd95354 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -24,9 +24,10 @@ Boston, MA 02111-1307, USA. */
#include "fixlib.h"
- #include <fcntl.h>
- #include <sys/mman.h>
- #define BAD_ADDR ((void*)-1)
+#if HAVE_MMAP
+#include <sys/mman.h>
+#define BAD_ADDR ((void*)-1)
+#endif
#include <signal.h>
@@ -528,10 +529,8 @@ run_compiles ()
&& (p_fixd->papz_machs != (const char**) NULL) )
{
tSCC case_fmt[] = "case %s in\n"; /* 9 bytes, plus string */
- tSCC esac_fmt[] = " )\n" /* 3 bytes */
- " echo %s ;;\n" /* 13 bytes */
- "* ) echo %s ;;\n" /* 13 bytes */
- "esac"; /* 4 bytes */
+ tSCC esac_fmt[] =
+ " )\n echo %s ;;\n* ) echo %s ;;\nesac";/* 4 bytes */
tSCC skip[] = "skip"; /* 4 bytes */
tSCC run[] = "run"; /* 3 bytes */
/* total bytes to add to machine sum: 49 - see fixincl.tpl */
diff --git a/gcc/fixinc/fixtests.c b/gcc/fixinc/fixtests.c
index aac14924c049..fa4470301d46 100644
--- a/gcc/fixinc/fixtests.c
+++ b/gcc/fixinc/fixtests.c
@@ -295,10 +295,10 @@ run_test( tname, fname, text )
const char* fname;
const char* text;
{
- #define _FT_(n,p) { n, p },
+#define _FT_(n,p) { n, p },
static test_entry_t test_table[] = { FIX_TEST_TABLE { NULL, NULL }};
- #undef _FT_
- #define TEST_TABLE_CT ((sizeof(test_table)/sizeof(test_table[0]))-1)
+#undef _FT_
+#define TEST_TABLE_CT ((sizeof(test_table)/sizeof(test_table[0]))-1)
int ct = TEST_TABLE_CT;
test_entry_t* pte = test_table;
--
GitLab