mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-12 12:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: de-duplicate sub-architecture strings accumulation

Browse Source 
Introduce a helper function to replace 4 instances of similar code. Use
reconcat() to cover the previously explicit free().
This commit is contained in:
Jan Beulich 2022-07-05 08:39:43 +02:00
parent 10e52570b8
commit 8180707f90
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gas/config/tc-i386.c
View File

@ -2847,6 +2847,16 @@ check_cpu_arch_compatible (const char *name ATTRIBUTE_UNUSED,
#endif
}
static void
extend_cpu_sub_arch_name (const char *name)
{
if (cpu_sub_arch_name)
cpu_sub_arch_name = reconcat (cpu_sub_arch_name, cpu_sub_arch_name,
name, (const char *) NULL);
else
cpu_sub_arch_name = xstrdup (name);
}
static void
set_cpu_arch (int dummy ATTRIBUTE_UNUSED)
{
@ -2895,16 +2905,7 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED)
if (!cpu_flags_equal (&flags, &cpu_arch_flags))
{
if (cpu_sub_arch_name)
{
char *name = cpu_sub_arch_name;
cpu_sub_arch_name = concat (name,
cpu_arch[j].name,
(const char *) NULL);
free (name);
}
else
cpu_sub_arch_name = xstrdup (cpu_arch[j].name);
extend_cpu_sub_arch_name (string);
cpu_arch_flags = flags;
cpu_arch_isa_flags = flags;
}
@ -2928,15 +2929,7 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED)
cpu_noarch[j].flags);
if (!cpu_flags_equal (&flags, &cpu_arch_flags))
{
if (cpu_sub_arch_name)
{
char *name = cpu_sub_arch_name;
cpu_sub_arch_name = concat (name, string,
(const char *) NULL);
free (name);
}
else
cpu_sub_arch_name = xstrdup (string);
extend_cpu_sub_arch_name (string);
cpu_arch_flags = flags;
cpu_arch_isa_flags = flags;
}
@ -13403,16 +13396,7 @@ md_parse_option (int c, const char *arg)
if (!cpu_flags_equal (&flags, &cpu_arch_flags))
{
if (cpu_sub_arch_name)
{
char *name = cpu_sub_arch_name;
cpu_sub_arch_name = concat (name,
cpu_arch[j].name,
(const char *) NULL);
free (name);
}
else
cpu_sub_arch_name = xstrdup (cpu_arch[j].name);
extend_cpu_sub_arch_name (cpu_arch[j].name);
cpu_arch_flags = flags;
cpu_arch_isa_flags = flags;
}
@ -13436,15 +13420,7 @@ md_parse_option (int c, const char *arg)
cpu_noarch[j].flags);
if (!cpu_flags_equal (&flags, &cpu_arch_flags))
{
if (cpu_sub_arch_name)
{
char *name = cpu_sub_arch_name;
cpu_sub_arch_name = concat (arch,
(const char *) NULL);
free (name);
}
else
cpu_sub_arch_name = xstrdup (arch);
extend_cpu_sub_arch_name (arch);
cpu_arch_flags = flags;
cpu_arch_isa_flags = flags;
}