From 31b04dee8eb4afbb67f914bf9286b1adb271e820 Mon Sep 17 00:00:00 2001 From: bonzini Date: Mon, 30 Aug 2004 13:32:57 +0000 Subject: 2004-08-30 Paolo Bonzini * fixinc/Makefile.in (machname.h): Remove. (fixincl.x): Do not pass $@ to genfixes. * fixinc/genfixes: Remove code to produce machname.h. * fixinc/fixincl.sh: Move it here instead. * fixinc/fixlib.c: Do not conditionalize on MN_NAME_PAT's presence, instead check if pz_mn_name_pat is NULL. Make mn_get_regexps return a bool indicating whether pz_mn_name_pat is NULL. * fixinc/fixlib.h: Do not conditionalize on MN_NAME_PAT's presence. Declare extern C variables for the ENV_TABLE. * fixinc/fixfixes.c: Do not conditionalize on MN_NAME_PAT's presence, instead use the result of mn_get_regexps. * fixinc/fixtests.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86771 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fixinc/fixfixes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc/fixinc/fixfixes.c') diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c index a8901ffdf0f..19fa27ed121 100644 --- a/gcc/fixinc/fixfixes.c +++ b/gcc/fixinc/fixfixes.c @@ -488,9 +488,6 @@ FIX_PROC_HEAD( char_macro_def_fix ) FIX_PROC_HEAD( machine_name_fix ) { -#ifndef MN_NAME_PAT - fputs( "The target machine has no needed machine name fixes\n", stderr ); -#else regmatch_t match[2]; const char *line, *base, *limit, *p, *q; regex_t *label_re, *name_re; @@ -499,7 +496,11 @@ FIX_PROC_HEAD( machine_name_fix ) IGNORE_ARG(filname); IGNORE_ARG(p_fixd); - mn_get_regexps (&label_re, &name_re, "machine_name_fix"); + if (!mn_get_regexps (&label_re, &name_re, "machine_name_fix")) + { + fputs( "The target machine has no needed machine name fixes\n", stderr ); + goto done; + } scratch[0] = '_'; scratch[1] = '_'; @@ -577,7 +578,6 @@ FIX_PROC_HEAD( machine_name_fix ) } } done: -#endif fputs (text, stdout); } -- cgit v1.2.3