format. */
static const char *
-get_ident(void)
+get_ident (void)
{
static char result[IDENT_LENGTH];
static const char template[IDENT_LENGTH] = "gpch.012";
void *target_validity;
static const char partial_pch[IDENT_LENGTH] = "gpcWrite";
- if (! pch_file)
+ if (!pch_file)
return;
f = fopen (pch_file, "w+b");
if (f == NULL)
- fatal_error ("can't create precompiled header %s: %m", pch_file);
+ fatal_error ("can%'t create precompiled header %s: %m", pch_file);
pch_outfile = f;
-
- if (strlen (host_machine) > 255 || strlen (target_machine) > 255
- || strlen (version_string) > 255)
- abort ();
+
+ gcc_assert (strlen (host_machine) < 256
+ && strlen (target_machine) < 256
+ && strlen (version_string) < 256);
v.host_machine_length = strlen (host_machine);
v.target_machine_length = strlen (target_machine);
for (i = 0; i < MATCH_SIZE; i++)
{
v.match[i] = *pch_matching[i].flag_var;
- if (v.match[i] != *pch_matching[i].flag_var)
- abort ();
+ gcc_assert (v.match[i] == *pch_matching[i].flag_var);
}
}
v.pch_init = &pch_init;
|| fwrite (target_machine, v.target_machine_length, 1, f) != 1
|| fwrite (version_string, v.version_length, 1, f) != 1
|| fwrite (target_validity, v.target_data_length, 1, f) != 1)
- fatal_error ("can't write to %s: %m", pch_file);
+ fatal_error ("can%'t write to %s: %m", pch_file);
/* We need to be able to re-read the output. */
/* The driver always provides a valid -o option. */
if (asm_file_name == NULL
|| strcmp (asm_file_name, "-") == 0)
- fatal_error ("`%s' is not a valid output file", asm_file_name);
+ fatal_error ("%qs is not a valid output file", asm_file_name);
asm_file_startpos = ftell (asm_out_file);
h.asm_size = asm_file_end - asm_file_startpos;
if (fwrite (&h, sizeof (h), 1, pch_outfile) != 1)
- fatal_error ("can't write %s: %m", pch_file);
+ fatal_error ("can%'t write %s: %m", pch_file);
buf = xmalloc (16384);
- fflush (asm_out_file);
if (fseek (asm_out_file, asm_file_startpos, SEEK_SET) != 0)
- fatal_error ("can't seek in %s: %m", asm_file_name);
+ fatal_error ("can%'t seek in %s: %m", asm_file_name);
for (written = asm_file_startpos; written < asm_file_end; )
{
if (size > 16384)
size = 16384;
if (fread (buf, size, 1, asm_out_file) != 1)
- fatal_error ("can't read %s: %m", asm_file_name);
+ fatal_error ("can%'t read %s: %m", asm_file_name);
if (fwrite (buf, size, 1, pch_outfile) != 1)
- fatal_error ("can't write %s: %m", pch_file);
+ fatal_error ("can%'t write %s: %m", pch_file);
written += size;
}
free (buf);
- /* asm_out_file can be written afterwards, so must be flushed first. */
- fflush (asm_out_file);
+ /* asm_out_file can be written afterwards, so fseek to clear
+ _IOREAD flag. */
+ if (fseek (asm_out_file, 0, SEEK_END) != 0)
+ fatal_error ("can%'t seek in %s: %m", asm_file_name);
gt_pch_save (pch_outfile);
cpp_write_pch_state (parse_in, pch_outfile);
if (fseek (pch_outfile, 0, SEEK_SET) != 0
|| fwrite (get_ident (), IDENT_LENGTH, 1, pch_outfile) != 1)
- fatal_error ("can't write %s: %m", pch_file);
+ fatal_error ("can%'t write %s: %m", pch_file);
fclose (pch_outfile);
}
sizeread = read (fd, ident, IDENT_LENGTH);
if (sizeread == -1)
- fatal_error ("can't read %s: %m", name);
+ fatal_error ("can%'t read %s: %m", name);
else if (sizeread != IDENT_LENGTH)
return 2;
/* At this point, we know it's a PCH file, so it ought to be long enough
that we can read a c_pch_validity structure. */
if (read (fd, &v, sizeof (v)) != sizeof (v))
- fatal_error ("can't read %s: %m", name);
+ fatal_error ("can%'t read %s: %m", name);
strings_length = (v.host_machine_length + v.target_machine_length
+ v.version_length);
if (read (fd, short_strings, strings_length) != strings_length)
- fatal_error ("can't read %s: %m", name);
+ fatal_error ("can%'t read %s: %m", name);
if (v.host_machine_length != strlen (host_machine)
|| memcmp (host_machine, short_strings, strlen (host_machine)) != 0)
{
if (cpp_get_options (pfile)->warn_invalid_pch)
cpp_error (pfile, CPP_DL_WARNING,
- "%s: created on host `%.*s', but used on host `%s'", name,
+ "%s: created on host '%.*s', but used on host '%s'", name,
v.host_machine_length, short_strings, host_machine);
return 2;
}
{
if (cpp_get_options (pfile)->warn_invalid_pch)
cpp_error (pfile, CPP_DL_WARNING,
- "%s: created for target `%.*s', but used for target `%s'",
+ "%s: created for target '%.*s', but used for target '%s'",
name, v.target_machine_length,
short_strings + v.host_machine_length, target_machine);
return 2;
{
if (cpp_get_options (pfile)->warn_invalid_pch)
cpp_error (pfile, CPP_DL_WARNING,
- "%s: created by version `%.*s', but this is version `%s'",
+ "%s: created by version '%.*s', but this is version '%s'",
name, v.version_length,
(short_strings + v.host_machine_length
+ v.target_machine_length),
if ((size_t) read (fd, this_file_data, v.target_data_length)
!= v.target_data_length)
- fatal_error ("can't read %s: %m", name);
+ fatal_error ("can%'t read %s: %m", name);
msg = targetm.pch_valid_p (this_file_data, v.target_data_length);
free (this_file_data);
if (msg != NULL)
return result == 0;
}
+/* If non-NULL, this function is called after a precompile header file
+ is loaded. */
+void (*lang_post_pch_load) (void);
+
/* Load in the PCH file NAME, open on FD. It was originally searched for
by ORIG_NAME. */
{
FILE *f;
struct c_pch_header h;
- char *buf;
- unsigned long written;
struct save_macro_data *smd;
f = fdopen (fd, "rb");
return;
}
- buf = xmalloc (16384);
- for (written = 0; written < h.asm_size; )
+ if (!flag_preprocess_only)
{
- long size = h.asm_size - written;
- if (size > 16384)
- size = 16384;
- if (fread (buf, size, 1, f) != 1
- || fwrite (buf, size, 1, asm_out_file) != 1)
- cpp_errno (pfile, CPP_DL_ERROR, "reading");
- written += size;
+ unsigned long written;
+ char * buf = xmalloc (16384);
+
+ for (written = 0; written < h.asm_size; )
+ {
+ long size = h.asm_size - written;
+ if (size > 16384)
+ size = 16384;
+ if (fread (buf, size, 1, f) != 1
+ || fwrite (buf, size, 1, asm_out_file) != 1)
+ cpp_errno (pfile, CPP_DL_ERROR, "reading");
+ written += size;
+ }
+ free (buf);
+ }
+ else
+ {
+ /* If we're preprocessing, don't write to a NULL
+ asm_out_file. */
+ if (fseek (f, h.asm_size, SEEK_CUR) != 0)
+ cpp_errno (pfile, CPP_DL_ERROR, "seeking");
}
- free (buf);
cpp_prepare_state (pfile, &smd);
return;
fclose (f);
+
+ /* Give the front end a chance to take action after a PCH file has
+ been loaded. */
+ if (lang_post_pch_load)
+ (*lang_post_pch_load) ();
}
/* Indicate that no more PCH files should be read. */
host_hooks.gt_pch_use_address (NULL, 0, -1, 0);
}
}
+
+/* Handle #pragma GCC pch_preprocess, to load in the PCH file. */
+
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
+void
+c_common_pch_pragma (cpp_reader *pfile)
+{
+ tree name_t;
+ const char *name;
+ int fd;
+
+ if (c_lex (&name_t) != CPP_STRING)
+ {
+ error ("malformed #pragma GCC pch_preprocess, ignored");
+ return;
+ }
+
+ if (!cpp_get_options (pfile)->preprocessed)
+ {
+ error ("pch_preprocess pragma should only be used with -fpreprocessed");
+ inform ("use #include instead");
+ return;
+ }
+
+ name = TREE_STRING_POINTER (name_t);
+
+ fd = open (name, O_RDONLY | O_BINARY, 0666);
+ if (fd == -1)
+ fatal_error ("%s: couldn%'t open PCH file: %m\n", name);
+
+ if (c_common_valid_pch (pfile, name, fd) != 1)
+ {
+ if (!cpp_get_options (pfile)->warn_invalid_pch)
+ inform ("use -Winvalid-pch for more information");
+ fatal_error ("%s: PCH file was invalid", name);
+ }
+
+ c_common_read_pch (pfile, name, fd, name);
+
+ close (fd);
+}
OSDN Git Service
