From a32f2771a5b1265435b332f15020b66bed552af4 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 25 Nov 2000 19:28:44 +0000 Subject: [PATCH] c-common.c: Remove USE_CPPLIB conditional inclusions. * c-common.c: Remove USE_CPPLIB conditional inclusions. * c-common.h: Similarly. * c-decl.c: Similarly. * c-lang.c: Similarly. * c-lex.c: Similarly. * c-parse.in: Similarly. * c-pragma.c: Similarly. * c-pragma.h: Similarly. * gcc.c: Similarly. * toplev.c: Similarly. * cp/cp-tree.h: Similarly. * cp/decl2.c: Similarly. * cp/lang-specs.h: Similarly. * cp/lex.c: Similarly. * cp/lex.h: Similarly. * cp/spew.c: Similarly. * java/lang-options.h: Similarly. * objc/lang-specs.h: Similarly. * objc/objc-act.c: Similarly. * configure.in: Remove configure option. * config.in: Regenerate. * configure: Regenerate. From-SVN: r37742 --- gcc/ChangeLog | 26 ++ gcc/c-common.c | 88 ------ gcc/c-common.h | 5 - gcc/c-decl.c | 8 +- gcc/c-lang.c | 17 +- gcc/c-lex.c | 607 +--------------------------------------- gcc/c-parse.in | 18 -- gcc/c-pragma.c | 149 ---------- gcc/c-pragma.h | 5 - gcc/config.in | 3 - gcc/configure | 497 ++++++++++++++++---------------- gcc/configure.in | 12 - gcc/cp/cp-tree.h | 6 +- gcc/cp/decl2.c | 14 +- gcc/cp/lang-specs.h | 12 +- gcc/cp/lex.c | 41 +-- gcc/cp/lex.h | 4 - gcc/cp/spew.c | 14 - gcc/gcc.c | 9 +- gcc/java/lang-options.h | 9 - gcc/objc/lang-specs.h | 10 +- gcc/objc/objc-act.c | 11 - gcc/toplev.c | 4 - 23 files changed, 284 insertions(+), 1285 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 97cd49a9fbe..aa541b8e7b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,29 @@ +2000-11-25 Neil Booth + + * c-common.c: Remove USE_CPPLIB conditional inclusions. + * c-common.h: Similarly. + * c-decl.c: Similarly. + * c-lang.c: Similarly. + * c-lex.c: Similarly. + * c-parse.in: Similarly. + * c-pragma.c: Similarly. + * c-pragma.h: Similarly. + * gcc.c: Similarly. + * toplev.c: Similarly. + * cp/cp-tree.h: Similarly. + * cp/decl2.c: Similarly. + * cp/lang-specs.h: Similarly. + * cp/lex.c: Similarly. + * cp/lex.h: Similarly. + * cp/spew.c: Similarly. + * java/lang-options.h: Similarly. + * objc/lang-specs.h: Similarly. + * objc/objc-act.c: Similarly. + + * configure.in: Remove configure option. + * config.in: Regenerate. + * configure: Regenerate. + 2000-11-25 Richard Henderson * haifa-sched.c (sched_analyze_1, sched_analyze_2, sched_analyze): diff --git a/gcc/c-common.c b/gcc/c-common.c index 4efa88257c3..e839ae507ac 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -34,11 +34,8 @@ Boston, MA 02111-1307, USA. */ #include "intl.h" #include "diagnostic.h" #include "obstack.h" - -#if USE_CPPLIB #include "cpplib.h" cpp_reader parse_in; -#endif #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE TYPE_PRECISION (wchar_type_node) @@ -4710,91 +4707,6 @@ truthvalue_conversion (expr) return build_binary_op (NE_EXPR, expr, integer_zero_node, 1); } -#if !USE_CPPLIB -/* Read the rest of a #-directive from input stream FINPUT. - In normal use, the directive name and the white space after it - have already been read, so they won't be included in the result. - We allow for the fact that the directive line may contain - a newline embedded within a character or string literal which forms - a part of the directive. - - The value is a string in a reusable buffer. It remains valid - only until the next time this function is called. - - The terminating character ('\n' or EOF) is left in FINPUT for the - caller to re-read. */ - -char * -get_directive_line (finput) - register FILE *finput; -{ - static char *directive_buffer = NULL; - static unsigned buffer_length = 0; - register char *p; - register char *buffer_limit; - register int looking_for = 0; - register int char_escaped = 0; - - if (buffer_length == 0) - { - directive_buffer = (char *)xmalloc (128); - buffer_length = 128; - } - - buffer_limit = &directive_buffer[buffer_length]; - - for (p = directive_buffer; ; ) - { - int c; - - /* Make buffer bigger if it is full. */ - if (p >= buffer_limit) - { - register unsigned bytes_used = (p - directive_buffer); - - buffer_length *= 2; - directive_buffer - = (char *)xrealloc (directive_buffer, buffer_length); - p = &directive_buffer[bytes_used]; - buffer_limit = &directive_buffer[buffer_length]; - } - - c = getc (finput); - - /* Discard initial whitespace. */ - if ((c == ' ' || c == '\t') && p == directive_buffer) - continue; - - /* Detect the end of the directive. */ - if (looking_for == 0 - && (c == '\n' || c == EOF)) - { - ungetc (c, finput); - c = '\0'; - } - - *p++ = c; - - if (c == 0) - return directive_buffer; - - /* Handle string and character constant syntax. */ - if (looking_for) - { - if (looking_for == c && !char_escaped) - looking_for = 0; /* Found terminator... stop looking. */ - } - else - if (c == '\'' || c == '"') - looking_for = c; /* Don't stop buffering until we see another - one of these (or an EOF). */ - - /* Handle backslash. */ - char_escaped = (c == '\\' && ! char_escaped); - } -} -#endif /* USE_CPPLIB */ - /* Make a variant type in the proper way for C/C++, propagating qualifiers down to the element type of an array. */ diff --git a/gcc/c-common.h b/gcc/c-common.h index 5f6e4d2335b..b27c76069a8 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -463,13 +463,8 @@ extern void overflow_warning PARAMS ((tree)); extern void unsigned_conversion_warning PARAMS ((tree, tree)); /* Read the rest of the current #-directive line. */ -#if USE_CPPLIB extern char *get_directive_line PARAMS ((void)); #define GET_DIRECTIVE_LINE() get_directive_line () -#else -extern char *get_directive_line PARAMS ((FILE *)); -#define GET_DIRECTIVE_LINE() get_directive_line (finput) -#endif /* Subroutine of build_binary_op, used for comparison operations. See if the operands have both been converted from subword integer types diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 9da1923adee..bfaf451e2b8 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -41,11 +41,8 @@ Boston, MA 02111-1307, USA. */ #include "defaults.h" #include "ggc.h" #include "tm_p.h" - -#if USE_CPPLIB #include "cpplib.h" extern cpp_reader parse_in; -#endif /* In grokdeclarator, distinguish syntactic contexts of declarators. */ enum decl_context @@ -512,11 +509,8 @@ c_decode_option (argc, argv) int strings_processed; const char *option_value = NULL; char *p = argv[0]; -#if USE_CPPLIB + strings_processed = cpp_handle_option (&parse_in, argc, argv); -#else - strings_processed = 0; -#endif /* ! USE_CPPLIB */ if (!strcmp (p, "-lang-objc")) c_language = clk_objective_c; diff --git a/gcc/c-lang.c b/gcc/c-lang.c index 1c9fe38f133..8197265a7c4 100644 --- a/gcc/c-lang.c +++ b/gcc/c-lang.c @@ -34,13 +34,10 @@ Boston, MA 02111-1307, USA. */ #include "expr.h" #include "c-tree.h" #include "c-lex.h" - -static int c_tree_printer PARAMS ((output_buffer *)); - -#if USE_CPPLIB #include "cpplib.h" + extern cpp_reader parse_in; -#endif +static int c_tree_printer PARAMS ((output_buffer *)); /* Each of the functions defined here is an alternative to a function in objc-actions.c. */ @@ -56,10 +53,9 @@ lang_decode_option (argc, argv) void lang_init_options () { -#if USE_CPPLIB cpp_init (); cpp_reader_init (&parse_in, CLK_GNUC89); -#endif + /* Mark as "unspecified". */ flag_bounds_check = -1; } @@ -80,13 +76,6 @@ lang_init () mesg_implicit_function_declaration = 0; } - /* the beginning of the file is a new line; check for # */ - /* With luck, we discover the real source file's name from that - and put it in input_filename. */ -#if !USE_CPPLIB - ungetc (check_newline (), finput); -#endif - save_lang_status = &push_c_function_context; restore_lang_status = &pop_c_function_context; mark_lang_status = &mark_c_function_context; diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 4f9b8cc7e01..7918c5e17d0 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -53,12 +53,7 @@ Boston, MA 02111-1307, USA. */ #define GET_ENVIRONMENT(ENV_VALUE,ENV_NAME) ((ENV_VALUE) = getenv (ENV_NAME)) #endif -#if USE_CPPLIB extern cpp_reader parse_in; -#else -/* Stream for reading from the input file. */ -FILE *finput; -#endif /* The original file name, before changing "-" to "stdin". */ static const char *orig_filename; @@ -73,52 +68,6 @@ static splay_tree file_info_tree; /* Cause the `yydebug' variable to be defined. */ #define YYDEBUG 1 -#if !USE_CPPLIB - -struct putback_buffer -{ - unsigned char *buffer; - int buffer_size; - int index; -}; - -static struct putback_buffer putback = {NULL, 0, -1}; - -static inline int getch PARAMS ((void)); - -static inline int -getch () -{ - if (putback.index != -1) - { - int ch = putback.buffer[putback.index]; - --putback.index; - return ch; - } - return getc (finput); -} - -static inline void put_back PARAMS ((int)); - -static inline void -put_back (ch) - int ch; -{ - if (ch != EOF) - { - if (putback.index == putback.buffer_size - 1) - { - putback.buffer_size += 16; - putback.buffer = xrealloc (putback.buffer, putback.buffer_size); - } - putback.buffer[++putback.index] = ch; - } -} - -int linemode; - -#endif - /* File used for outputting assembler code. */ extern FILE *asm_out_file; @@ -128,12 +77,6 @@ extern FILE *asm_out_file; /* Number of bytes in a wide character. */ #define WCHAR_BYTES (WCHAR_TYPE_SIZE / BITS_PER_UNIT) -#if !USE_CPPLIB -static int maxtoken; /* Current nominal length of token buffer. */ -static char *token_buffer; /* Pointer to token buffer. - Actual allocated length is maxtoken + 2. */ -#endif - int indent_level; /* Number of { minus number of }. */ int pending_lang_change; /* If we need to switch languages - C++ only */ int c_header_level; /* depth in C headers - C++ only */ @@ -151,21 +94,11 @@ static tree lex_string PARAMS ((const char *, unsigned int, int)); static tree lex_charconst PARAMS ((const char *, unsigned int, int)); static void update_header_times PARAMS ((const char *)); static int dump_one_header PARAMS ((splay_tree_node, void *)); - -#if !USE_CPPLIB -static int skip_white_space PARAMS ((int)); -static char *extend_token_buffer PARAMS ((const char *)); -static void extend_token_buffer_to PARAMS ((int)); -static int read_line_number PARAMS ((int *)); -static void process_directive PARAMS ((void)); -#else static void cb_ident PARAMS ((cpp_reader *, const cpp_string *)); static void cb_enter_file PARAMS ((cpp_reader *)); static void cb_leave_file PARAMS ((cpp_reader *)); static void cb_rename_file PARAMS ((cpp_reader *)); static void cb_def_pragma PARAMS ((cpp_reader *)); -#endif - const char * init_c_lex (filename) @@ -193,23 +126,6 @@ init_c_lex (filename) GET_ENVIRONMENT (literal_codeset, "LANG"); #endif -#if !USE_CPPLIB - /* Open input file. */ - if (filename == 0 || !strcmp (filename, "-")) - { - finput = stdin; - filename = "stdin"; - } - else - finput = fopen (filename, "r"); - if (finput == 0) - pfatal_with_name (filename); - -#ifdef IO_BUFFER_SIZE - setvbuf (finput, (char *) xmalloc (IO_BUFFER_SIZE), _IOFBF, IO_BUFFER_SIZE); -#endif -#else /* !USE_CPPLIB */ - parse_in.cb.ident = cb_ident; parse_in.cb.enter_file = cb_enter_file; parse_in.cb.leave_file = cb_leave_file; @@ -221,12 +137,7 @@ init_c_lex (filename) if (filename == 0 || !strcmp (filename, "-")) filename = "stdin"; -#endif -#if !USE_CPPLIB - maxtoken = 40; - token_buffer = (char *) xmalloc (maxtoken + 2); -#endif /* Start it at 0, because check_newline is called at the very beginning and will increment it to 1. */ lineno = lex_lineno = 0; @@ -309,140 +220,7 @@ dump_time_statistics () splay_tree_foreach (file_info_tree, dump_one_header, 0); } -#if !USE_CPPLIB - -/* If C is not whitespace, return C. - Otherwise skip whitespace and return first nonwhite char read. */ - -static int -skip_white_space (c) - register int c; -{ - for (;;) - { - switch (c) - { - /* There is no need to process comments or backslash-newline - here. None can occur in the output of cpp. Do handle \r - in case someone sent us a .i file. */ - - case '\n': - if (linemode) - { - put_back (c); - return EOF; - } - c = check_newline (); - break; - - case '\r': - /* Per C99, horizontal whitespace is just these four characters. */ - case ' ': - case '\t': - case '\f': - case '\v': - c = getch (); - break; - - case '\\': - error ("stray '\\' in program"); - c = getch (); - break; - - default: - return (c); - } - } -} - -/* Skips all of the white space at the current location in the input file. */ - -void -position_after_white_space () -{ - register int c; - - c = getch (); - - put_back (skip_white_space (c)); -} - -/* Make the token buffer longer, preserving the data in it. - P should point to just beyond the last valid character in the old buffer. - The value we return is a pointer to the new buffer - at a place corresponding to P. */ - -static void -extend_token_buffer_to (size) - int size; -{ - do - maxtoken = maxtoken * 2 + 10; - while (maxtoken < size); - token_buffer = (char *) xrealloc (token_buffer, maxtoken + 2); -} - -static char * -extend_token_buffer (p) - const char *p; -{ - int offset = p - token_buffer; - extend_token_buffer_to (offset); - return token_buffer + offset; -} - - -static int -read_line_number (num) - int *num; -{ - tree value; - enum cpp_ttype token = c_lex (&value); - - if (token == CPP_NUMBER && TREE_CODE (value) == INTEGER_CST) - { - *num = TREE_INT_CST_LOW (value); - return 1; - } - else - { - if (token != CPP_EOF) - error ("invalid #-line"); - return 0; - } -} - -/* At the beginning of a line, increment the line number - and process any #-directive on this line. - If the line is a #-directive, read the entire line and return a newline. - Otherwise, return the line's first non-whitespace character. */ - -int -check_newline () -{ - register int c; - - /* Loop till we get a nonblank, non-directive line. */ - for (;;) - { - /* Read first nonwhite char on the line. */ - do - c = getch (); - while (c == ' ' || c == '\t'); - - lex_lineno++; - if (c == '#') - { - process_directive (); - return '\n'; - } - - else if (c != '\n') - break; - } - return c; -} - +#if 0 /* Keep this code for a while for reference. */ static void process_directive () { @@ -674,7 +452,7 @@ linenum: while (getch () != '\n'); } -#else /* USE_CPPLIB */ +#endif /* Not yet handled: #pragma, #define, #undef. No need to deal with linemarkers under normal conditions. */ @@ -810,7 +588,6 @@ cb_def_pragma (pfile) warning ("ignoring #pragma %s", space); } } -#endif /* USE_CPPLIB */ /* Parse a '\uNNNN' or '\UNNNNNNNN' sequence. @@ -1430,7 +1207,6 @@ int c_lex (value) tree *value; { -#if USE_CPPLIB cpp_token tok; enum cpp_ttype type; @@ -1493,387 +1269,8 @@ c_lex (value) } return type; - -#else - int c; - char *p; - int wide_flag = 0; - int objc_flag = 0; - int charconst = 0; - - *value = NULL_TREE; - - retry: - c = getch (); - - /* Effectively do c = skip_white_space (c) - but do it faster in the usual cases. */ - while (1) - switch (c) - { - case ' ': - case '\t': - case '\f': - case '\v': - c = getch (); - break; - - case '\r': - case '\n': - c = skip_white_space (c); - default: - goto found_nonwhite; - } - found_nonwhite: - - lineno = lex_lineno; - - switch (c) - { - case EOF: - return CPP_EOF; - - case 'L': - /* Capital L may start a wide-string or wide-character constant. */ - { - register int c1 = getch(); - if (c1 == '\'') - { - wide_flag = 1; - goto char_constant; - } - if (c1 == '"') - { - wide_flag = 1; - goto string_constant; - } - put_back (c1); - } - goto letter; - - case '@': - if (!doing_objc_thang) - goto straychar; - else - { - /* '@' may start a constant string object. */ - register int c1 = getch (); - if (c1 == '"') - { - objc_flag = 1; - goto string_constant; - } - put_back (c1); - /* Fall through to treat '@' as the start of an identifier. */ - } - - case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'G': case 'H': case 'I': case 'J': - case 'K': case 'M': case 'N': case 'O': - case 'P': case 'Q': case 'R': case 'S': case 'T': - case 'U': case 'V': case 'W': case 'X': case 'Y': - case 'Z': - case 'a': case 'b': case 'c': case 'd': case 'e': - case 'f': case 'g': case 'h': case 'i': case 'j': - case 'k': case 'l': case 'm': case 'n': case 'o': - case 'p': case 'q': case 'r': case 's': case 't': - case 'u': case 'v': case 'w': case 'x': case 'y': - case 'z': - case '_': - case '$': - letter: - p = token_buffer; - while (ISALNUM (c) || c == '_' || c == '$' || c == '@') - { - /* Make sure this char really belongs in an identifier. */ - if (c == '$') - { - if (! dollars_in_ident) - error ("'$' in identifier"); - else if (pedantic) - pedwarn ("'$' in identifier"); - } - - if (p >= token_buffer + maxtoken) - p = extend_token_buffer (p); - - *p++ = c; - c = getch(); - } - - put_back (c); - - if (p >= token_buffer + maxtoken) - p = extend_token_buffer (p); - *p = 0; - - *value = get_identifier (token_buffer); - return CPP_NAME; - - case '.': - { - /* It's hard to preserve tokenization on '.' because - it could be a symbol by itself, or it could be the - start of a floating point number and cpp won't tell us. */ - int c1 = getch (); - if (c1 == '.') - { - int c2 = getch (); - if (c2 == '.') - return CPP_ELLIPSIS; - - put_back (c2); - error ("parse error at '..'"); - } - else if (c1 == '*' && c_language == clk_cplusplus) - return CPP_DOT_STAR; - - put_back (c1); - if (ISDIGIT (c1)) - goto number; - } - return CPP_DOT; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - number: - p = token_buffer; - /* Scan the next preprocessing number. All C numeric constants - are preprocessing numbers, but not all preprocessing numbers - are valid numeric constants. Preprocessing numbers fit the - regular expression \.?[0-9]([0-9a-zA-Z_.]|[eEpP][+-])* - See C99 section 6.4.8. */ - for (;;) - { - if (p >= token_buffer + maxtoken) - p = extend_token_buffer (p); - - *p++ = c; - c = getch(); - - if (c == '+' || c == '-') - { - int d = p[-1]; - if (d == 'e' || d == 'E' || d == 'p' || d == 'P') - continue; - } - if (ISALNUM (c) || c == '_' || c == '.') - continue; - break; - } - put_back (c); - - *value = lex_number (token_buffer, p - token_buffer); - return CPP_NUMBER; - - case '\'': - char_constant: - charconst = 1; - - case '"': - string_constant: - { - int delimiter = charconst ? '\'' : '"'; -#ifdef MULTIBYTE_CHARS - int longest_char = local_mb_cur_max (); - (void) local_mbtowc (NULL_PTR, NULL_PTR, 0); -#endif - c = getch (); - p = token_buffer + 1; - - while (c != delimiter && c != EOF) - { - if (p + 2 > token_buffer + maxtoken) - p = extend_token_buffer (p); - - /* ignore_escape_flag is set for reading the filename in #line. */ - if (!ignore_escape_flag && c == '\\') - { - *p++ = c; - *p++ = getch (); /* escaped character */ - c = getch (); - continue; - } - else - { -#ifdef MULTIBYTE_CHARS - int i; - int char_len = -1; - for (i = 0; i < longest_char; ++i) - { - if (p + i >= token_buffer + maxtoken) - p = extend_token_buffer (p); - p[i] = c; - - char_len = local_mblen (p, i + 1); - if (char_len != -1) - break; - c = getch (); - } - if (char_len == -1) - { - /* Replace all except the first byte. */ - put_back (c); - for (--i; i > 0; --i) - put_back (p[i]); - char_len = 1; - } - /* mbtowc sometimes needs an extra char before accepting */ - else if (char_len <= i) - put_back (c); - - p += char_len; -#else - *p++ = c; -#endif - c = getch (); - } - } - } - - if (charconst) - { - *value = lex_charconst (token_buffer + 1, p - (token_buffer + 1), - wide_flag); - return wide_flag ? CPP_WCHAR : CPP_CHAR; - } - else - { - *value = lex_string (token_buffer + 1, p - (token_buffer + 1), - wide_flag); - return wide_flag ? CPP_WSTRING : objc_flag ? CPP_OSTRING : CPP_STRING; - } - - case '+': - case '-': - case '&': - case '|': - case ':': - case '<': - case '>': - case '*': - case '/': - case '%': - case '^': - case '!': - case '=': - { - int c1; - enum cpp_ttype type = CPP_EOF; - - switch (c) - { - case '+': type = CPP_PLUS; break; - case '-': type = CPP_MINUS; break; - case '&': type = CPP_AND; break; - case '|': type = CPP_OR; break; - case ':': type = CPP_COLON; break; - case '<': type = CPP_LESS; break; - case '>': type = CPP_GREATER; break; - case '*': type = CPP_MULT; break; - case '/': type = CPP_DIV; break; - case '%': type = CPP_MOD; break; - case '^': type = CPP_XOR; break; - case '!': type = CPP_NOT; break; - case '=': type = CPP_EQ; break; - } - - c1 = getch (); - - if (c1 == '=' && type < CPP_LAST_EQ) - return type + (CPP_EQ_EQ - CPP_EQ); - else if (c == c1) - switch (c) - { - case '+': return CPP_PLUS_PLUS; - case '-': return CPP_MINUS_MINUS; - case '&': return CPP_AND_AND; - case '|': return CPP_OR_OR; - case ':': - if (c_language == clk_cplusplus) - return CPP_SCOPE; - break; - - case '<': type = CPP_LSHIFT; goto do_triad; - case '>': type = CPP_RSHIFT; goto do_triad; - } - else - switch (c) - { - case '-': - if (c1 == '>') - { - if (c_language == clk_cplusplus) - { - c1 = getch (); - if (c1 == '*') - return CPP_DEREF_STAR; - put_back (c1); - } - return CPP_DEREF; - } - break; - - case '>': - if (c1 == '?' && c_language == clk_cplusplus) - { type = CPP_MAX; goto do_triad; } - break; - - case '<': - if (c1 == ':' && flag_digraphs) - return CPP_OPEN_SQUARE; - if (c1 == '%' && flag_digraphs) - { indent_level++; return CPP_OPEN_BRACE; } - if (c1 == '?' && c_language == clk_cplusplus) - { type = CPP_MIN; goto do_triad; } - break; - - case ':': - if (c1 == '>' && flag_digraphs) - return CPP_CLOSE_SQUARE; - break; - case '%': - if (c1 == '>' && flag_digraphs) - { indent_level--; return CPP_CLOSE_BRACE; } - break; - } - - put_back (c1); - return type; - - do_triad: - c1 = getch (); - if (c1 == '=') - type += (CPP_EQ_EQ - CPP_EQ); - else - put_back (c1); - return type; - } - - case '~': return CPP_COMPL; - case '?': return CPP_QUERY; - case ',': return CPP_COMMA; - case '(': return CPP_OPEN_PAREN; - case ')': return CPP_CLOSE_PAREN; - case '[': return CPP_OPEN_SQUARE; - case ']': return CPP_CLOSE_SQUARE; - case '{': indent_level++; return CPP_OPEN_BRACE; - case '}': indent_level--; return CPP_CLOSE_BRACE; - case ';': return CPP_SEMICOLON; - - straychar: - default: - if (ISGRAPH (c)) - error ("stray '%c' in program", c); - else - error ("stray '\\%#o' in program", c); - goto retry; - } - /* NOTREACHED */ -#endif } - #define ERROR(msgid) do { error(msgid); goto syntax_error; } while(0) static tree diff --git a/gcc/c-parse.in b/gcc/c-parse.in index d73ba4bf8da..5ade99ff3d2 100644 --- a/gcc/c-parse.in +++ b/gcc/c-parse.in @@ -2830,9 +2830,7 @@ end ifobjc cpplib.h's token codes into yacc's token codes. */ static enum cpp_ttype last_token; -#if USE_CPPLIB extern cpp_reader parse_in; -#endif /* The reserved keyword table. */ struct resword @@ -3137,25 +3135,11 @@ init_parse (filename) void finish_parse () { -#if USE_CPPLIB cpp_finish (&parse_in); errorcount += parse_in.errors; -#else - fclose (finput); -#endif } -#if USE_CPPLIB #define NAME(type) cpp_type2name (type) -#else -/* Bleah */ -#include "symcat.h" -#define OP(e, s) s, -#define TK(e, s) STRINGX(e), - -static const char *type2name[N_TTYPES] = { TTYPE_TABLE }; -#define NAME(type) type2name[type] -#endif static void yyerror (msgid) @@ -3248,10 +3232,8 @@ _yylex () case CPP_DOT: return '.'; case CPP_EOF: -#if USE_CPPLIB cpp_pop_buffer (&parse_in); if (! CPP_BUFFER (&parse_in)) -#endif return 0; goto retry; diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c index a9f41f91aa6..2bb0bc57e2b 100644 --- a/gcc/c-pragma.c +++ b/gcc/c-pragma.c @@ -32,16 +32,7 @@ Boston, MA 02111-1307, USA. */ #include "c-lex.h" #include "tm_p.h" -#if USE_CPPLIB extern cpp_reader parse_in; -#else -struct pragma_entry; -static struct pragma_entry *pragmas; - -void cpp_register_pragma PARAMS ((cpp_reader *, const char *, const char *, - void (*) PARAMS ((cpp_reader *)) )); -void cpp_register_pragma_space PARAMS ((cpp_reader *, const char *)); -#endif #define BAD(msgid) do { warning (msgid); return; } while (0) #define BAD2(msgid, arg) do { warning (msgid, arg); return; } while (0) @@ -312,151 +303,11 @@ handle_pragma_weak (dummy) } #endif -#if !USE_CPPLIB -/* Glue version of cpplib's pragma registration and dispatch system. */ -struct pragma_entry -{ - struct pragma_entry *next; - const char *name; - size_t len; - int isnspace; - union { - void (*handler) PARAMS ((cpp_reader *)); - struct pragma_entry *space; - } u; -}; - -void -cpp_register_pragma_space (pfile, space) - cpp_reader *pfile ATTRIBUTE_UNUSED; - const char *space; -{ - struct pragma_entry *new; - const struct pragma_entry *p = pragmas; - size_t len = strlen (space); - - while (p) - { - if (p->isnspace && p->len == len && !memcmp (p->name, space, len)) - return; - p = p->next; - } - - new = (struct pragma_entry *) xmalloc (sizeof (struct pragma_entry)); - new->name = space; - new->len = len; - new->isnspace = 1; - new->u.space = 0; - - new->next = pragmas; - pragmas = new; -} - -void -cpp_register_pragma (pfile, space, name, handler) - cpp_reader *pfile ATTRIBUTE_UNUSED; - const char *space; - const char *name; - void (*handler) PARAMS ((cpp_reader *)); -{ - struct pragma_entry **x, *new; - size_t len; - - x = &pragmas; - if (space) - { - struct pragma_entry *p = pragmas; - len = strlen (space); - while (p) - { - if (p->isnspace && p->len == len && !memcmp (p->name, space, len)) - { - x = &p->u.space; - goto found; - } - p = p->next; - } - abort (); - } - - found: - new = (struct pragma_entry *) xmalloc (sizeof (struct pragma_entry)); - new->name = name; - new->len = strlen (name); - new->isnspace = 0; - new->u.handler = handler; - - new->next = *x; - *x = new; -} - -/* Called from process_directive() for #pragma lines. */ -void -dispatch_pragma () -{ - enum cpp_ttype t; - tree x; - const struct pragma_entry *p; - const char *name, *space = 0; - size_t len; - - p = pragmas; - - new_space: - t = c_lex (&x); - if (t == CPP_EOF) - return; - - if (t != CPP_NAME) - { - warning ("malformed #pragma directive"); - return; - } - - name = IDENTIFIER_POINTER (x); - len = IDENTIFIER_LENGTH (x); - while (p) - { - if (strlen (p->name) == len && !memcmp (p->name, name, len)) - { - if (p->isnspace) - { - space = p->name; - p = p->u.space; - goto new_space; - } - else - { - (*p->u.handler) (0); - return; - } - } - p = p->next; - } - - /* Issue a warning message if we have been asked to do so. Ignore - unknown pragmas in system headers unless an explicit - -Wunknown-pragmas has been given. */ - if (warn_unknown_pragmas > in_system_header) - { - if (space) - warning ("ignoring #pragma %s %s", space, name); - else - warning ("ignoring #pragma %s", name); - } -} - -#endif - void init_pragma () { cpp_reader *pfile ATTRIBUTE_UNUSED; -#if !USE_CPPLIB - pfile = 0; -#else pfile = &parse_in; -#endif #ifdef HANDLE_PRAGMA_PACK cpp_register_pragma (pfile, 0, "pack", handle_pragma_pack); diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h index 314273bde2e..5e867452315 100644 --- a/gcc/c-pragma.h +++ b/gcc/c-pragma.h @@ -59,11 +59,6 @@ extern int add_weak PARAMS ((const char *, const char *)); extern void init_pragma PARAMS ((void)); -/* If cpplib is in use, it handles dispatch. */ -#if !USE_CPPLIB -extern void dispatch_pragma PARAMS ((void)); -#endif - /* Duplicate prototypes for the register_pragma stuff and the typedef for cpp_reader, to avoid dragging cpplib.h in almost everywhere... */ #ifndef __GCC_CPPLIB__ diff --git a/gcc/config.in b/gcc/config.in index c710b1760d6..63af4048e4c 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -308,9 +308,6 @@ every opportunity. This is extremely expensive. */ #undef ENABLE_GC_ALWAYS_COLLECT -/* Define if you want the preprocessor merged into the C and C++ compilers. */ -#undef USE_CPPLIB - /* Define if you want the C and C++ compilers to support multibyte character sets for source code. */ #undef MULTIBYTE_CHARS diff --git a/gcc/configure b/gcc/configure index 0052af0942d..4c74b4d4cf3 100755 --- a/gcc/configure +++ b/gcc/configure @@ -43,9 +43,6 @@ ac_help="$ac_help --with-cpp-install-dir=DIR install the user visible C preprocessor in DIR (relative to PREFIX) as well as PREFIX/bin." -ac_help="$ac_help - --enable-c-cpplib link cpplib directly into C and C++ compilers - (HIGHLY EXPERIMENTAL)." ac_help="$ac_help --enable-c-mbchar Enable multibyte characters for C and C++." ac_help="$ac_help @@ -613,7 +610,7 @@ copy=cp # - two terminals occur directly after each other # - the path contains an element with a dot in it echo $ac_n "checking LIBRARY_PATH variable""... $ac_c" 1>&6 -echo "configure:617: checking LIBRARY_PATH variable" >&5 +echo "configure:614: checking LIBRARY_PATH variable" >&5 case ${LIBRARY_PATH} in [:\;]* | *[:\;] | *[:\;][:\;]* | *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* ) library_path_setting="contains current directory" @@ -638,7 +635,7 @@ fi # - two terminals occur directly after each other # - the path contains an element with a dot in it echo $ac_n "checking GCC_EXEC_PREFIX variable""... $ac_c" 1>&6 -echo "configure:642: checking GCC_EXEC_PREFIX variable" >&5 +echo "configure:639: checking GCC_EXEC_PREFIX variable" >&5 case ${GCC_EXEC_PREFIX} in [:\;]* | *[:\;] | *[:\;][:\;]* | *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* ) gcc_exec_prefix_setting="contains current directory" @@ -754,7 +751,7 @@ fi # Build a new-libstdc++ system (ie libstdc++-v3) echo $ac_n "checking for libstdc++ to install""... $ac_c" 1>&6 -echo "configure:758: checking for libstdc++ to install" >&5 +echo "configure:755: checking for libstdc++ to install" >&5 # Check whether --enable-libstdcxx-v3 or --disable-libstdcxx-v3 was given. if test "${enable_libstdcxx_v3+set}" = set; then enableval="$enable_libstdcxx_v3" @@ -885,23 +882,7 @@ fi fi -# Link cpplib into the compiler proper, for C/C++/ObjC. Defaults to on. maybe_cpplib=libcpp.a -# Check whether --enable-c-cpplib or --disable-c-cpplib was given. -if test "${enable_c_cpplib+set}" = set; then - enableval="$enable_c_cpplib" - if test x$enable_c_cpplib != xyes; then - maybe_cpplib= -fi - -fi - -if test x$maybe_cpplib != x ; then - cat >> confdefs.h <<\EOF -#define USE_CPPLIB 1 -EOF - -fi # Enable Multibyte Characters for C/C++ @@ -1030,7 +1011,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1034: checking host system type" >&5 +echo "configure:1015: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1051,7 +1032,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1055: checking target system type" >&5 +echo "configure:1036: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1069,7 +1050,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1073: checking build system type" >&5 +echo "configure:1054: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1096,7 +1077,7 @@ test "$host_alias" != "$target_alias" && # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1100: checking for $ac_word" >&5 +echo "configure:1081: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1126,7 +1107,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1111: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1158,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1181: checking for $ac_word" >&5 +echo "configure:1162: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1209,7 +1190,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1213: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1194: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1220,12 +1201,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1224 "configure" +#line 1205 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1251,12 +1232,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1255: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1260: checking whether we are using GNU C" >&5 +echo "configure:1241: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1265,7 +1246,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1284,7 +1265,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1288: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1269: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1317,10 +1298,10 @@ fi if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:1321: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:1302: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:1324: checking whether cc understands -c and -o together" >&5 +echo "configure:1305: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -1332,16 +1313,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:1336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:1317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:1345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -1377,7 +1358,7 @@ fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:1381: checking for long double" >&5 +echo "configure:1362: checking for long double" >&5 if eval "test \"`echo '$''{'gcc_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1385,7 +1366,7 @@ else gcc_cv_c_long_double=yes else cat > conftest.$ac_ext <= sizeof(double)):; ; return 0; } EOF -if { (eval echo configure:1399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_long_double=yes else @@ -1418,21 +1399,21 @@ fi echo $ac_n "checking whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6 -echo "configure:1422: checking whether ${CC-cc} accepts -Wno-long-long" >&5 +echo "configure:1403: checking whether ${CC-cc} accepts -Wno-long-long" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_no_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="-Wno-long-long" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_cc_no_long_long=yes else @@ -1476,7 +1457,7 @@ esac echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1480: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1461: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1504,7 +1485,7 @@ fi echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6 -echo "configure:1508: checking whether a default assembler was specified" >&5 +echo "configure:1489: checking whether a default assembler was specified" >&5 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then if test x"$gas_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6 @@ -1516,7 +1497,7 @@ else fi echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6 -echo "configure:1520: checking whether a default linker was specified" >&5 +echo "configure:1501: checking whether a default linker was specified" >&5 if test x"${DEFAULT_LINKER+set}" = x"set"; then if test x"$gnu_ld_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6 @@ -1528,12 +1509,12 @@ else fi echo $ac_n "checking for GNU C library""... $ac_c" 1>&6 -echo "configure:1532: checking for GNU C library" >&5 +echo "configure:1513: checking for GNU C library" >&5 if eval "test \"`echo '$''{'gcc_cv_glibc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1543,7 +1524,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_glibc=yes else @@ -1564,21 +1545,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1568: checking for inline" >&5 +echo "configure:1549: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1610,7 +1591,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1614: checking for $ac_word" >&5 +echo "configure:1595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1640,7 +1621,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:1644: checking whether ln works" >&5 +echo "configure:1625: checking whether ln works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1672,7 +1653,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1676: checking whether ln -s works" >&5 +echo "configure:1657: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1704,19 +1685,19 @@ else fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:1708: checking for volatile" >&5 +echo "configure:1689: checking for volatile" >&5 if eval "test \"`echo '$''{'gcc_cv_c_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_volatile=yes else @@ -1739,7 +1720,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1743: checking for $ac_word" >&5 +echo "configure:1724: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1777,7 +1758,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1781: checking for a BSD compatible install" >&5 +echo "configure:1762: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1828,7 +1809,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1832: checking how to run the C preprocessor" >&5 +echo "configure:1813: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1843,13 +1824,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1860,13 +1841,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1877,13 +1858,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1908,12 +1889,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1912: checking for ANSI C header files" >&5 +echo "configure:1893: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1921,7 +1902,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1938,7 +1919,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1956,7 +1937,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1977,7 +1958,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1988,7 +1969,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2012,12 +1993,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2016: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1997: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2026,7 +2007,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2047,12 +2028,12 @@ EOF fi echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:2051: checking whether string.h and strings.h may both be included" >&5 +echo "configure:2032: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'gcc_cv_header_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2060,7 +2041,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_string=yes else @@ -2081,12 +2062,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2085: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2066: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2102,7 +2083,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2129,17 +2110,17 @@ for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2133: checking for $ac_hdr" >&5 +echo "configure:2114: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2169,17 +2150,17 @@ done # Check for thread headers. ac_safe=`echo "thread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for thread.h""... $ac_c" 1>&6 -echo "configure:2173: checking for thread.h" >&5 +echo "configure:2154: checking for thread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2203,17 +2184,17 @@ fi ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:2207: checking for pthread.h" >&5 +echo "configure:2188: checking for pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2240,7 +2221,7 @@ fi # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2244: checking for $ac_word" >&5 +echo "configure:2225: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2279,7 +2260,7 @@ else # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2283: checking for $ac_word" >&5 +echo "configure:2264: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2308,13 +2289,13 @@ fi if test -n "$MAKEINFO"; then # Found it, now check the version. echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6 -echo "configure:2312: checking for modern makeinfo" >&5 +echo "configure:2293: checking for modern makeinfo" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:2318: version of makeinfo is $ac_prog_version" >&5 + echo "configure:2299: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 3.1[2-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9]) @@ -2349,7 +2330,7 @@ else # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2353: checking for $ac_word" >&5 +echo "configure:2334: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2386,7 +2367,7 @@ else # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2390: checking for $ac_word" >&5 +echo "configure:2371: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2420,12 +2401,12 @@ fi echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:2424: checking for preprocessor stringizing operator" >&5 +echo "configure:2405: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 # Use only if it exists, # doesn't clash with , and declares intmax_t. echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:2462: checking for inttypes.h" >&5 +echo "configure:2443: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2471,7 +2452,7 @@ int main() { intmax_t i = -1; ; return 0; } EOF -if { (eval echo configure:2475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_inttypes_h=yes else @@ -2496,7 +2477,7 @@ fi # be either signed or unsigned. # echo $ac_n "checking for unsigned enumerated bitfields""... $ac_c" 1>&6 -echo "configure:2500: checking for unsigned enumerated bitfields" >&5 +echo "configure:2481: checking for unsigned enumerated bitfields" >&5 if eval "test \"`echo '$''{'gcc_cv_enum_bf_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2504,7 +2485,7 @@ else gcc_cv_enum_bf_unsigned=yes else cat > conftest.$ac_ext < enum t { BLAH = 128 } ; @@ -2517,7 +2498,7 @@ int main(void) } EOF -if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_cv_enum_bf_unsigned=yes else @@ -2545,12 +2526,12 @@ for ac_func in strtoul bsearch putenv popen bcopy \ fputs_unlocked getrusage valloc iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2549: checking for $ac_func" >&5 +echo "configure:2530: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2599,12 +2580,12 @@ done echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:2603: checking for ssize_t" >&5 +echo "configure:2584: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2635,12 +2616,12 @@ fi # Try to determine the array type of the second argument of getgroups # for the target system (int or gid_t). echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2639: checking for uid_t in sys/types.h" >&5 +echo "configure:2620: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2669,7 +2650,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2673: checking type of array argument to getgroups" >&5 +echo "configure:2654: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2677,7 +2658,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2716,7 +2697,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2757,12 +2738,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2761: checking for vprintf" >&5 +echo "configure:2742: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2809,12 +2790,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2813: checking for _doprnt" >&5 +echo "configure:2794: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2873,7 +2854,7 @@ fi echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6 -echo "configure:2877: checking whether the printf functions support %p" >&5 +echo "configure:2858: checking whether the printf functions support %p" >&5 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2881,7 +2862,7 @@ else gcc_cv_func_printf_ptr=no else cat > conftest.$ac_ext < @@ -2894,7 +2875,7 @@ int main() return (p != q); } EOF -if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_cv_func_printf_ptr=yes else @@ -2927,12 +2908,12 @@ case "${host}" in ;; esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2931: checking for pid_t" >&5 +echo "configure:2912: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2961,17 +2942,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:2965: checking for vfork.h" >&5 +echo "configure:2946: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2996,18 +2977,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:3000: checking for working vfork" >&5 +echo "configure:2981: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:3006: checking for vfork" >&5 +echo "configure:2987: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -3052,7 +3033,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -3147,7 +3128,7 @@ main() { } } EOF -if { (eval echo configure:3151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -3173,17 +3154,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3177: checking for $ac_hdr" >&5 +echo "configure:3158: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3212,12 +3193,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3216: checking for $ac_func" >&5 +echo "configure:3197: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3265,7 +3246,7 @@ fi done echo $ac_n "checking for working mmap which provides zeroed pages anywhere""... $ac_c" 1>&6 -echo "configure:3269: checking for working mmap which provides zeroed pages anywhere" >&5 +echo "configure:3250: checking for working mmap which provides zeroed pages anywhere" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_anywhere'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3273,7 +3254,7 @@ else ac_cv_func_mmap_anywhere=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_anywhere=yes else @@ -3379,7 +3360,7 @@ EOF fi echo $ac_n "checking for working mmap of a file""... $ac_c" 1>&6 -echo "configure:3383: checking for working mmap of a file" >&5 +echo "configure:3364: checking for working mmap of a file" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3394,7 +3375,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_mmap_file=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_file=yes else @@ -3464,12 +3445,12 @@ for ac_func in bcopy \ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:3468: checking whether $ac_func is declared" >&5 +echo "configure:3449: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -3573,12 +3554,12 @@ for ac_func in getrlimit setrlimit getrusage do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:3577: checking whether $ac_func is declared" >&5 +echo "configure:3558: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -3636,12 +3617,12 @@ CFLAGS="$saved_CFLAGS" # mkdir takes a single argument on some systems. echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:3640: checking if mkdir takes one argument" >&5 +echo "configure:3621: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3658,7 +3639,7 @@ int main() { mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:3662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_mkdir_takes_one_arg=no else @@ -3966,7 +3947,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:3970: checking for strerror in -lcposix" >&5 +echo "configure:3951: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3974,7 +3955,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4008,18 +3989,18 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4012: checking for working const" >&5 +echo "configure:3993: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4083,12 +4064,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4087: checking for off_t" >&5 +echo "configure:4068: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4116,12 +4097,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4120: checking for size_t" >&5 +echo "configure:4101: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4151,19 +4132,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4155: checking for working alloca.h" >&5 +echo "configure:4136: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { -char *p = alloca(2 * sizeof(int)); +void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4184,12 +4165,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4188: checking for alloca" >&5 +echo "configure:4169: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4249,12 +4230,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4253: checking whether alloca needs Cray hooks" >&5 +echo "configure:4234: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4283: checking for $ac_func" >&5 +echo "configure:4264: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4334,7 +4315,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4338: checking stack direction for C alloca" >&5 +echo "configure:4319: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4342,7 +4323,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4388,17 +4369,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4392: checking for $ac_hdr" >&5 +echo "configure:4373: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4428,12 +4409,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4432: checking for $ac_func" >&5 +echo "configure:4413: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4485,12 +4466,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4489: checking for $ac_func" >&5 +echo "configure:4470: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4547,19 +4528,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4551: checking for LC_MESSAGES" >&5 +echo "configure:4532: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -4580,7 +4561,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:4584: checking whether NLS is requested" >&5 +echo "configure:4565: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -4600,7 +4581,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:4604: checking whether included gettext is requested" >&5 +echo "configure:4585: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -4619,17 +4600,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4623: checking for libintl.h" >&5 +echo "configure:4604: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4646,19 +4627,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:4650: checking for gettext in libc" >&5 +echo "configure:4631: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -4674,7 +4655,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4678: checking for bindtextdomain in -lintl" >&5 +echo "configure:4659: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4682,7 +4663,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4709,12 +4690,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:4713: checking for gettext in libintl" >&5 +echo "configure:4694: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:4718: checking for gettext in -lintl" >&5 +echo "configure:4699: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4722,7 +4703,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4772,7 +4753,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4776: checking for $ac_word" >&5 +echo "configure:4757: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4806,12 +4787,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4810: checking for $ac_func" >&5 +echo "configure:4791: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4861,7 +4842,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4865: checking for $ac_word" >&5 +echo "configure:4846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4897,7 +4878,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4901: checking for $ac_word" >&5 +echo "configure:4882: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4929,7 +4910,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4962,7 +4943,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:4966: checking whether catgets can be used" >&5 +echo "configure:4947: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -4975,7 +4956,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:4979: checking for main in -li" >&5 +echo "configure:4960: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4983,14 +4964,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5018,12 +4999,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:5022: checking for catgets" >&5 +echo "configure:5003: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -5068,7 +5049,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5072: checking for $ac_word" >&5 +echo "configure:5053: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5104,7 +5085,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5108: checking for $ac_word" >&5 +echo "configure:5089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5141,7 +5122,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5145: checking for $ac_word" >&5 +echo "configure:5126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5179,7 +5160,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5183: checking for $ac_word" >&5 +echo "configure:5164: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5237,7 +5218,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5241: checking for $ac_word" >&5 +echo "configure:5222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5271,7 +5252,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5275: checking for $ac_word" >&5 +echo "configure:5256: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5310,7 +5291,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5314: checking for $ac_word" >&5 +echo "configure:5295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5409,7 +5390,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:5413: checking for catalogs to be installed" >&5 +echo "configure:5394: checking for catalogs to be installed" >&5 if test "x$LINGUAS" = "x"; then LINGUAS=$ALL_LINGUAS else @@ -5441,17 +5422,17 @@ echo "configure:5413: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:5445: checking for linux/version.h" >&5 +echo "configure:5426: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5526,7 +5507,7 @@ fi echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:5530: checking whether windows registry support is requested" >&5 +echo "configure:5511: checking whether windows registry support is requested" >&5 if test x$enable_win32_registry != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -5555,7 +5536,7 @@ esac if test x$enable_win32_registry != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:5559: checking registry key on windows hosts" >&5 +echo "configure:5540: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 -echo "configure:5739: checking what assembler to use" >&5 +echo "configure:5720: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -5820,7 +5801,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:5824: checking what nm to use" >&5 +echo "configure:5805: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test x$host = x$target; then @@ -5831,7 +5812,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6 # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:5835: checking assembler alignment features" >&5 +echo "configure:5816: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -5879,7 +5860,7 @@ fi echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:5883: checking assembler subsection support" >&5 +echo "configure:5864: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -5919,7 +5900,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:5923: checking assembler weak support" >&5 +echo "configure:5904: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -5942,7 +5923,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:5946: checking assembler hidden support" >&5 +echo "configure:5927: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -5968,7 +5949,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6 case "$target" in sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:5972: checking assembler .register pseudo-op support" >&5 +echo "configure:5953: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5996,7 +5977,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:6000: checking assembler supports -relax" >&5 +echo "configure:5981: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6026,7 +6007,7 @@ EOF case "$tm_file" in *64*) echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6 -echo "configure:6030: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:6011: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6071,7 +6052,7 @@ EOF if test "x$gcc_cv_as_flags64" != xno; then echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:6075: checking for assembler offsetable %lo() support" >&5 +echo "configure:6056: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6110,7 +6091,7 @@ EOF i[34567]86-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:6114: checking assembler instructions" >&5 +echo "configure:6095: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -6139,7 +6120,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:6143: checking assembler dwarf2 debug_line support" >&5 +echo "configure:6124: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -6316,7 +6297,7 @@ EOF echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:6320: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6301: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index aa848be8ae2..890acec11c3 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -271,19 +271,7 @@ elif test x$withval != xno; then cpp_install_dir=$withval fi]) -# Link cpplib into the compiler proper, for C/C++/ObjC. Defaults to on. maybe_cpplib=libcpp.a -AC_ARG_ENABLE(c-cpplib, -[ --enable-c-cpplib link cpplib directly into C and C++ compilers - (HIGHLY EXPERIMENTAL).], -[if test x$enable_c_cpplib != xyes; then - maybe_cpplib= -fi] -) -if test x$maybe_cpplib != x ; then - AC_DEFINE(USE_CPPLIB, 1, - [Define if you want the preprocessor merged into the C and C++ compilers.]) -fi AC_SUBST(maybe_cpplib) # Enable Multibyte Characters for C/C++ diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 34c9d136511..ed233a2e92a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3214,13 +3214,9 @@ extern void unsigned_conversion_warning PARAMS ((tree, tree)); extern void c_apply_type_quals_to_decl PARAMS ((int, tree)); /* Read the rest of the current #-directive line. */ -#if USE_CPPLIB extern char *get_directive_line PARAMS ((void)); #define GET_DIRECTIVE_LINE() get_directive_line () -#else -extern char *get_directive_line PARAMS ((FILE *)); -#define GET_DIRECTIVE_LINE() get_directive_line (finput) -#endif + /* Subroutine of build_binary_op, used for comparison operations. See if the operands have both been converted from subword integer types and, if so, perhaps change them both back to their original type. */ diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 43874fb63c0..a66bb95b481 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -45,11 +45,8 @@ Boston, MA 02111-1307, USA. */ #include "dwarfout.h" #include "ggc.h" #include "timevar.h" - -#if USE_CPPLIB #include "cpplib.h" extern cpp_reader parse_in; -#endif /* This structure contains information about the initializations and/or destructions required for a particular priority level. */ @@ -566,20 +563,13 @@ compare_options (p1, p2) int lang_decode_option (argc, argv) - int argc -#if !USE_CPPLIB - ATTRIBUTE_UNUSED -#endif - ; + int argc; char **argv; { int strings_processed; const char *p = argv[0]; -#if USE_CPPLIB + strings_processed = cpp_handle_option (&parse_in, argc, argv); -#else - strings_processed = 0; -#endif /* ! USE_CPPLIB */ if (!strcmp (p, "-ftraditional") || !strcmp (p, "-traditional")) /* ignore */; diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index 6f9839b0b9f..1f1428b43a3 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */ {".c++", "@c++"}, {".C", "@c++"}, {"@c++", -#if USE_CPPLIB /* cc1plus has an integrated ISO C preprocessor. We should invoke the external preprocessor if -save-temps is given. */ "%{E|M|MM:cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\ @@ -44,16 +43,7 @@ Boston, MA 02111-1307, USA. */ %{fnew-abi:-D__GXX_ABI_VERSION=100}\ %{ansi:-trigraphs -$ -D__STRICT_ANSI__}\ %(cc1_options) %2 %{+e*}\ - %{!fsyntax-only:%(invoke_as)}}}}" -#else /* ! USE_CPPLIB */ - "cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\ - %{fnew-abi:-D__GXX_ABI_VERSION=100}\ - %{ansi:-trigraphs -$ -D__STRICT_ANSI__} %(cpp_options)\ - %{!M:%{!MM:%{!E:%{!pipe:%g.ii} |\n\ - cc1plus -lang-c++ %{!pipe:%g.ii} %(cc1_options) %2 %{+e*}\ - %{!fsyntax-only:%(invoke_as)}}}}\n" -#endif /* ! USE_CPPLIB */ - }, + %{!fsyntax-only:%(invoke_as)}}}}"}, {".ii", "@c++-cpp-output"}, {"@c++-cpp-output", "%{!M:%{!MM:%{!E:\ diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 7e7da03865b..6498e7b8d43 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -79,13 +79,7 @@ static void init_operators PARAMS ((void)); #endif #include "cpplib.h" -#if USE_CPPLIB extern cpp_reader parse_in; -#else -FILE *finput; - -int linemode; -#endif /* Pending language change. Positive is push count, negative is pop count. */ @@ -252,10 +246,8 @@ static const char *cplus_tree_code_name[] = { void lang_init_options () { -#if USE_CPPLIB cpp_init (); cpp_reader_init (&parse_in, CLK_GNUC89); -#endif /* Default exceptions on. */ flag_exceptions = 1; @@ -276,13 +268,6 @@ lang_init () if (flag_bounds_check < 0) flag_bounds_check = flag_bounded_pointers; -#if !USE_CPPLIB - /* the beginning of the file is a new line; check for # */ - /* With luck, we discover the real source file's name from that - and put it in input_filename. */ - ungetc (check_newline (), finput); -#endif - if (flag_gnu_xref) GNU_xref_begin (input_filename); init_repo (input_filename); } @@ -676,21 +661,16 @@ init_reswords () static void init_cp_pragma () { -#if USE_CPPLIB -#define pfile &parse_in -#else -#define pfile 0 -#endif - cpp_register_pragma (pfile, 0, "vtable", handle_pragma_vtable); - cpp_register_pragma (pfile, 0, "unit", handle_pragma_unit); + cpp_register_pragma (&parse_in, 0, "vtable", handle_pragma_vtable); + cpp_register_pragma (&parse_in, 0, "unit", handle_pragma_unit); - cpp_register_pragma (pfile, 0, "interface", handle_pragma_interface); - cpp_register_pragma (pfile, 0, "implementation", + cpp_register_pragma (&parse_in, 0, "interface", handle_pragma_interface); + cpp_register_pragma (&parse_in, 0, "implementation", handle_pragma_implementation); - cpp_register_pragma_space (pfile, "GCC"); - cpp_register_pragma (pfile, "GCC", "interface", handle_pragma_interface); - cpp_register_pragma (pfile, "GCC", "implementation", + cpp_register_pragma_space (&parse_in, "GCC"); + cpp_register_pragma (&parse_in, "GCC", "interface", handle_pragma_interface); + cpp_register_pragma (&parse_in, "GCC", "implementation", handle_pragma_implementation); } @@ -762,12 +742,8 @@ init_parse (filename) void finish_parse () { -#if USE_CPPLIB cpp_finish (&parse_in); errorcount += parse_in.errors; -#else - fclose (finput); -#endif } inline void @@ -1174,12 +1150,9 @@ handle_pragma_implementation (dfile) else { main_filename = TREE_STRING_POINTER (fname); -#if USE_CPPLIB - if (cpp_included (&parse_in, main_filename)) warning ("#pragma implementation for %s appears after file is included", main_filename); -#endif } for (; ifiles; ifiles = ifiles->next) diff --git a/gcc/cp/lex.h b/gcc/cp/lex.h index 272a917f97e..f5f7d454cf7 100644 --- a/gcc/cp/lex.h +++ b/gcc/cp/lex.h @@ -70,10 +70,6 @@ typedef unsigned long RID_BIT_TYPE; /* assumed at least 32 bits */ used in a context which makes it a reference to a variable. */ extern tree lastiddecl; -#if !USE_CPPLIB -extern char *token_buffer; /* Pointer to token buffer. */ -#endif - /* Back-door communication channel to the lexer. */ extern int looking_for_typename; extern int looking_for_template; diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c index 0894993a8b6..e05b6f6ef41 100644 --- a/gcc/cp/spew.c +++ b/gcc/cp/spew.c @@ -45,9 +45,7 @@ Boston, MA 02111-1307, USA. */ #define SPEW_INLINE inline #endif -#if USE_CPPLIB extern cpp_reader parse_in; -#endif /* This takes a token stream that hasn't decided much about types and tries to figure out as much as it can, with excessive lookahead and @@ -327,11 +325,9 @@ read_token (t) #undef YYCODE case CPP_EOF: -#if USE_CPPLIB cpp_pop_buffer (&parse_in); if (CPP_BUFFER (&parse_in)) goto retry; -#endif t->yychar = 0; break; @@ -1377,17 +1373,7 @@ debug_yychar (yy) #endif -#if USE_CPPLIB #define NAME(type) cpp_type2name (type) -#else -/* Bleah */ -#include "symcat.h" -#define OP(e, s) s, -#define TK(e, s) STRINGX(e), - -static const char *type2name[N_TTYPES] = { TTYPE_TABLE }; -#define NAME(type) type2name[type] -#endif void yyerror (msgid) diff --git a/gcc/gcc.c b/gcc/gcc.c index 3ad74e4f0e1..d95b1c4cae2 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -722,7 +722,6 @@ static struct compiler default_compilers[] = /* Next come the entries for C. */ {".c", "@c"}, {"@c", -#if USE_CPPLIB /* cc1 has an integrated ISO C preprocessor. We should invoke the external preprocessor if -save-temps or -traditional is given. */ "%{E|M|MM:%(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)}\ @@ -736,13 +735,7 @@ static struct compiler default_compilers[] = cc1 -fpreprocessed %{!pipe:%g.i} %(cc1_options)}\ %{!traditional:%{!ftraditional:%{!traditional-cpp:\ cc1 -lang-c %{ansi:-std=c89} %(cpp_options) %(cc1_options)}}}}\ - %{!fsyntax-only:%(invoke_as)}}}}" -#else /* ! USE_CPPLIB */ - "%(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options) \ - %{!M:%{!MM:%{!E:%{!pipe:%g.i} |\n\ - cc1 %{!pipe:%g.i} %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}" -#endif /* ! USE_CPPLIB */ - }, + %{!fsyntax-only:%(invoke_as)}}}}"}, {"-", "%{!E:%e-E required when input is from standard input}\ %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)"}, diff --git a/gcc/java/lang-options.h b/gcc/java/lang-options.h index 25a501573d0..e838813e0e8 100644 --- a/gcc/java/lang-options.h +++ b/gcc/java/lang-options.h @@ -36,15 +36,6 @@ DEFINE_LANG_NAME ("Java") { "-fuse-boehm-gc", "Generate code for Boehm GC" }, { "-fhash-synchronization", "Don't put synchronization structure in each object" }, { "-fjni", "Assume native functions are implemented using JNI" }, -#if ! USE_CPPLIB - { "-MD", "Print dependencies to FILE.d" }, - { "-MMD", "Print dependencies to FILE.d" }, - { "-M", "Print dependencies to stdout" }, - { "-MM", "Print dependencies to stdout" }, - { "-MA", "Print dummy rules for included files" }, - { "-MF", "Print dependencies to FILE" }, - { "-MT", "Use TARGET as name of target in dependency file" }, -#endif /* ! USE_CPPLIB */ { "--classpath", "Set class path and suppress system path" }, { "--CLASSPATH", "Set class path" }, { "--main", "Choose class whose main method should be used" }, diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h index f9e2c141f20..6fefc93e57f 100644 --- a/gcc/objc/lang-specs.h +++ b/gcc/objc/lang-specs.h @@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA. */ {".m", "@objective-c"}, {"@objective-c", -#if USE_CPPLIB /* cc1obj has an integrated ISO C preprocessor. We should invoke the external preprocessor if -save-temps or -traditional is given. */ "%{E|M|MM:%(trad_capable_cpp) -lang-objc %{ansi:-std=c89} %(cpp_options)}\ @@ -37,14 +36,7 @@ Boston, MA 02111-1307, USA. */ cc1obj -fpreprocessed %{!pipe:%g.mi} -lang-objc %(cc1_options) %{gen-decls}}\ %{!traditional:%{!ftraditional:%{!traditional-cpp:\ cc1obj -lang-objc %{ansi:-std=c89} %(cpp_options) %(cc1_options) %{gen-decls}}}}}\ - %{!fsyntax-only:%(invoke_as)}}}}" -#else /* ! USE_CPPLIB */ - "%(trad_capable_cpp) -lang-objc %{ansi:-std=c89} %(cpp_options)\ - %{!M:%{!MM:%{!E:%{!pipe:%g.mi} |\n\ - cc1obj -lang-objc %{!pipe:%g.mi} %(cc1_options) %{gen-decls}\ - %{!fsyntax-only:%(invoke_as)}}}}\n" -#endif /* ! USE_CPPLIB */ - }, + %{!fsyntax-only:%(invoke_as)}}}}"}, {".mi", "@objc-cpp-output"}, {"@objc-cpp-output", "%{!M:%{!MM:%{!E:cc1obj -lang-objc %i %(cc1_options) %{gen-decls}\ diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index b1b0279fbd7..2eff6e7b91b 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -55,11 +55,8 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "toplev.h" #include "ggc.h" - -#if USE_CPPLIB #include "cpplib.h" extern cpp_reader parse_in; -#endif /* This is the default way of generating a method name. */ /* I am not sure it is really correct. @@ -698,21 +695,13 @@ generate_struct_by_value_array () void lang_init_options () { -#if USE_CPPLIB cpp_init (); cpp_reader_init (&parse_in, CLK_GNUC89); -#endif } void lang_init () { -#if !USE_CPPLIB - /* The beginning of the file is a new line; check for #. - With luck, we discover the real source file's name from that - and put it in input_filename. */ - ungetc (check_newline (), finput); -#endif /* Force the line number back to 0; check_newline will have raised it to 1, which will make the builtin functions appear not to be built in. */ diff --git a/gcc/toplev.c b/gcc/toplev.c index 536e496daed..b2d8ea0bb98 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -3781,10 +3781,6 @@ display_help () unsigned long i; const char *lang; -#ifndef USE_CPPLIB - printf (_("Usage: %s input [switches]\n"), progname); - printf (_("Switches:\n")); -#endif printf (_(" -ffixed- Mark as being unavailable to the compiler\n")); printf (_(" -fcall-used- Mark as being corrupted by function calls\n")); printf (_(" -fcall-saved- Mark as being preserved across functions\n")); -- 2.30.2