Commit 9f78bf05 by Basile Starynkevitch Committed by Rafael Espindola

gengtype.c (nb_plugin_files): Make it unsigned to match num_gt_files.

2009-09-23  Basile Starynkevitch  <basile@starynkevitch.net>
            Rafael Avila de Espindola  <espindola@google.com>

	* gengtype.c (nb_plugin_files): Make it unsigned to match
	num_gt_files. Adjust other variables to avoid warnings.
	(main): Allocate an all zero lang_bitmap before each plugin file name
	to match regular file names.


Co-Authored-By: Rafael Avila de Espindola <espindola@google.com>

From-SVN: r152106
parent 2b4fa409
2009-09-23 Basile Starynkevitch <basile@starynkevitch.net>
Rafael Avila de Espindola <espindola@google.com>
* gengtype.c (nb_plugin_files): Make it unsigned to match
num_gt_files. Adjust other variables to avoid warnings.
(main): Allocate an all zero lang_bitmap before each plugin file name
to match regular file names.
2009-09-23 Richard Henderson <rth@redhat.com> 2009-09-23 Richard Henderson <rth@redhat.com>
* doc/tm.texi (STATIC_CHAIN, STATIC_CHAIN_INCOMING): Remove. * doc/tm.texi (STATIC_CHAIN, STATIC_CHAIN_INCOMING): Remove.
......
...@@ -144,7 +144,7 @@ static outf_p output_files; ...@@ -144,7 +144,7 @@ static outf_p output_files;
corresponding gt-<plugin>.h are generated in the current corresponding gt-<plugin>.h are generated in the current
directory. */ directory. */
static char** plugin_files; static char** plugin_files;
static int nb_plugin_files; static size_t nb_plugin_files;
/* The output header file that is included into pretty much every /* The output header file that is included into pretty much every
source file. */ source file. */
...@@ -464,7 +464,7 @@ read_input_list (const char *listname) ...@@ -464,7 +464,7 @@ read_input_list (const char *listname)
/* Add the plugin files if provided. */ /* Add the plugin files if provided. */
if (plugin_files) if (plugin_files)
{ {
int i; size_t i;
for (i = 0; i < nb_plugin_files; i++) for (i = 0; i < nb_plugin_files; i++)
gt_files[nfiles++] = plugin_files[i]; gt_files[nfiles++] = plugin_files[i];
} }
...@@ -1716,7 +1716,8 @@ get_output_file_with_visibility (const char *input_file) ...@@ -1716,7 +1716,8 @@ get_output_file_with_visibility (const char *input_file)
plugin_files. */ plugin_files. */
if (plugin_files && nb_plugin_files > 0) if (plugin_files && nb_plugin_files > 0)
{ {
int ix= -1, i; int ix= -1;
size_t i;
for (i = 0; i < nb_plugin_files && ix < 0; i++) for (i = 0; i < nb_plugin_files && ix < 0; i++)
if (strcmp (input_file, plugin_files[i]) == 0) if (strcmp (input_file, plugin_files[i]) == 0)
ix = i; ix = i;
...@@ -3657,8 +3658,17 @@ main (int argc, char **argv) ...@@ -3657,8 +3658,17 @@ main (int argc, char **argv)
{ {
srcdir = argv[2]; srcdir = argv[2];
inputlist = argv[3]; inputlist = argv[3];
plugin_files = argv+4;
nb_plugin_files = argc-4; nb_plugin_files = argc-4;
plugin_files = XCNEWVEC (char *, nb_plugin_files);
for (i = 0; i < nb_plugin_files; i++)
{
/* Place an all zero lang_bitmap before the plugin file
name. */
char *name = argv[i + 4];
int len = strlen(name) + 1 + sizeof (lang_bitmap);
plugin_files[i] = XCNEWVEC (char, len) + sizeof (lang_bitmap);
strcpy (plugin_files[i], name);
}
} }
else if (argc == 3) else if (argc == 3)
{ {
...@@ -3709,6 +3719,13 @@ main (int argc, char **argv) ...@@ -3709,6 +3719,13 @@ main (int argc, char **argv)
write_rtx_next (); write_rtx_next ();
close_output_files (); close_output_files ();
if (plugin_files)
{
for (i = 0; i < nb_plugin_files; i++)
free (plugin_files[i] - sizeof (lang_bitmap));
free (plugin_files);
}
if (hit_error) if (hit_error)
return 1; return 1;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment