[PATCH v4 01/22] bfd: rename parsing methods of object attribute v1 API
Matthieu Longo
matthieu.longo@arm.com
Thu Jul 3 16:27:04 GMT 2025
This patch is a preparation for the introduction of object attributes
v2. It aims at:
- making clear what methods are used to parse OAv1
- adding more constaints on parameters type by using enums instead of
defines.
- hiding the attribute tag type behind a typedef.
- preparing the move of object attributes's parsing code to another
file.
Note: the name obj_attr_v1_process_attribute is exposed in the API.
Ideally, the version should not be part of the name, and be hidden
behind a macro. However, a later patch will unify the parsing of
OAv1 and OAv2, and will make the use of such a macro obsolete.
---
bfd/elf-attrs.c | 42 ++++++++++++++++++++----------
bfd/elf-bfd.h | 22 +++++++++-------
bfd/elf32-arc.c | 2 +-
bfd/elf32-arm.c | 2 +-
bfd/elf32-csky.c | 2 +-
bfd/elf32-msp430.c | 2 +-
bfd/elf32-tic6x.c | 2 +-
bfd/elfnn-riscv.c | 2 +-
gas/config/obj-elf.c | 59 +++++++++++++++++++++++++++++--------------
gas/config/obj-elf.h | 7 ++---
gas/config/tc-arc.c | 6 ++---
gas/config/tc-arm.c | 8 +++---
gas/config/tc-m68k.c | 2 +-
gas/config/tc-mips.c | 2 +-
gas/config/tc-ppc.c | 2 +-
gas/config/tc-riscv.c | 4 +--
gas/config/tc-tic6x.c | 6 ++---
17 files changed, 107 insertions(+), 65 deletions(-)
diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index bc653d780de..e4f2d4b56c3 100644
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -236,7 +236,7 @@ bfd_elf_set_obj_attr_contents (bfd *abfd, bfd_byte *buffer, bfd_vma size)
/* Allocate/find an object attribute. */
static obj_attribute *
-elf_new_obj_attr (bfd *abfd, int vendor, unsigned int tag)
+elf_new_obj_attr (bfd *abfd, obj_attr_vendor vendor, obj_attr_tag_t tag)
{
obj_attribute *attr;
obj_attribute_list *list;
@@ -276,7 +276,9 @@ elf_new_obj_attr (bfd *abfd, int vendor, unsigned int tag)
/* Return the value of an integer object attribute. */
int
-bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, unsigned int tag)
+bfd_elf_get_obj_attr_int (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag)
{
obj_attribute_list *p;
@@ -302,7 +304,10 @@ bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, unsigned int tag)
/* Add an integer object attribute. */
obj_attribute *
-bfd_elf_add_obj_attr_int (bfd *abfd, int vendor, unsigned int tag, unsigned int i)
+bfd_elf_add_obj_attr_int (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag,
+ unsigned int value)
{
obj_attribute *attr;
@@ -310,7 +315,7 @@ bfd_elf_add_obj_attr_int (bfd *abfd, int vendor, unsigned int tag, unsigned int
if (attr != NULL)
{
attr->type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag);
- attr->i = i;
+ attr->i = value;
}
return attr;
}
@@ -344,7 +349,7 @@ _bfd_elf_attr_strdup (bfd *abfd, const char *s)
/* Add a string object attribute. */
static obj_attribute *
-elf_add_obj_attr_string (bfd *abfd, int vendor, unsigned int tag,
+elf_add_obj_attr_string (bfd *abfd, obj_attr_vendor vendor, obj_attr_tag_t tag,
const char *s, const char *end)
{
obj_attribute *attr;
@@ -361,7 +366,9 @@ elf_add_obj_attr_string (bfd *abfd, int vendor, unsigned int tag,
}
obj_attribute *
-bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, unsigned int tag,
+bfd_elf_add_obj_attr_string (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag,
const char *s)
{
return elf_add_obj_attr_string (abfd, vendor, tag, s, NULL);
@@ -369,8 +376,12 @@ bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, unsigned int tag,
/* Add a int+string object attribute. */
static obj_attribute *
-elf_add_obj_attr_int_string (bfd *abfd, int vendor, unsigned int tag,
- unsigned int i, const char *s, const char *end)
+elf_add_obj_attr_int_string (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag,
+ unsigned int i,
+ const char *s,
+ const char *end)
{
obj_attribute *attr;
@@ -387,8 +398,11 @@ elf_add_obj_attr_int_string (bfd *abfd, int vendor, unsigned int tag,
}
obj_attribute *
-bfd_elf_add_obj_attr_int_string (bfd *abfd, int vendor, unsigned int tag,
- unsigned int i, const char *s)
+bfd_elf_add_obj_attr_int_string (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag,
+ unsigned int i,
+ const char *s)
{
return elf_add_obj_attr_int_string (abfd, vendor, tag, i, s, NULL);
}
@@ -401,7 +415,7 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
obj_attribute *out_attr;
obj_attribute_list *list;
int i;
- int vendor;
+ obj_attr_vendor vendor;
if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour)
@@ -459,7 +473,7 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
/* Determine whether a GNU object attribute tag takes an integer, a
string or both. */
static int
-gnu_obj_attrs_arg_type (unsigned int tag)
+gnu_obj_attrs_arg_type (obj_attr_tag_t tag)
{
/* Except for Tag_compatibility, for GNU attributes we follow the
same rule ARM ones > 32 follow: odd-numbered tags take strings
@@ -474,7 +488,9 @@ gnu_obj_attrs_arg_type (unsigned int tag)
/* Determine what arguments an attribute tag takes. */
int
-_bfd_elf_obj_attrs_arg_type (bfd *abfd, int vendor, unsigned int tag)
+_bfd_elf_obj_attrs_arg_type (bfd *abfd,
+ obj_attr_vendor vendor,
+ obj_attr_tag_t tag)
{
switch (vendor)
{
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 5903d857faa..952c2c64b60 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -985,6 +985,8 @@ struct elf_find_verdep_info
struct bfd_elf_section_reloc_data;
+typedef uint32_t obj_attr_tag_t;
+
struct elf_backend_data
{
/* The architecture for this backend. */
@@ -1632,7 +1634,7 @@ struct elf_backend_data
/* Return 1, 2 or 3 to indicate what type of arguments a
processor-specific tag takes. */
- int (*obj_attrs_arg_type) (int);
+ int (*obj_attrs_arg_type) (obj_attr_tag_t);
/* The section type to use for an attributes section. */
unsigned int obj_attrs_section_type;
@@ -1944,15 +1946,17 @@ typedef struct obj_attribute
typedef struct obj_attribute_list
{
struct obj_attribute_list *next;
- unsigned int tag;
+ obj_attr_tag_t tag;
obj_attribute attr;
} obj_attribute_list;
/* Object attributes may either be defined by the processor ABI, index
OBJ_ATTR_PROC in the *_obj_attributes arrays, or be GNU-specific
(and possibly also processor-specific), index OBJ_ATTR_GNU. */
-#define OBJ_ATTR_PROC 0
-#define OBJ_ATTR_GNU 1
+typedef enum {
+ OBJ_ATTR_PROC = 0,
+ OBJ_ATTR_GNU = 1,
+} obj_attr_vendor;
#define OBJ_ATTR_FIRST OBJ_ATTR_PROC
#define OBJ_ATTR_LAST OBJ_ATTR_GNU
@@ -3055,17 +3059,17 @@ extern bfd *_bfd_elf64_bfd_from_remote_memory
extern bfd_vma bfd_elf_obj_attr_size (bfd *);
extern void bfd_elf_set_obj_attr_contents (bfd *, bfd_byte *, bfd_vma);
-extern int bfd_elf_get_obj_attr_int (bfd *, int, unsigned int);
+extern int bfd_elf_get_obj_attr_int (bfd *, obj_attr_vendor, obj_attr_tag_t);
extern obj_attribute *bfd_elf_add_obj_attr_int
- (bfd *, int, unsigned int, unsigned int);
+ (bfd *, obj_attr_vendor, obj_attr_tag_t, unsigned int);
#define bfd_elf_add_proc_attr_int(BFD, TAG, VALUE) \
bfd_elf_add_obj_attr_int ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
extern obj_attribute *bfd_elf_add_obj_attr_string
- (bfd *, int, unsigned int, const char *);
+ (bfd *, obj_attr_vendor, obj_attr_tag_t, const char *);
#define bfd_elf_add_proc_attr_string(BFD, TAG, VALUE) \
bfd_elf_add_obj_attr_string ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
extern obj_attribute *bfd_elf_add_obj_attr_int_string
- (bfd *, int, unsigned int, unsigned int, const char *);
+ (bfd *, obj_attr_vendor, obj_attr_tag_t, unsigned int, const char *);
#define bfd_elf_add_proc_attr_int_string(BFD, TAG, INTVAL, STRVAL) \
bfd_elf_add_obj_attr_int_string ((BFD), OBJ_ATTR_PROC, (TAG), \
(INTVAL), (STRVAL))
@@ -3074,7 +3078,7 @@ extern bool _bfd_elf_write_section_build_attributes
(bfd *, struct bfd_link_info *);
extern char *_bfd_elf_attr_strdup (bfd *, const char *);
extern void _bfd_elf_copy_obj_attributes (bfd *, bfd *);
-extern int _bfd_elf_obj_attrs_arg_type (bfd *, int, unsigned int);
+extern int _bfd_elf_obj_attrs_arg_type (bfd *, obj_attr_vendor, obj_attr_tag_t);
extern void _bfd_elf_parse_attributes (bfd *, Elf_Internal_Shdr *);
extern bool _bfd_elf_merge_object_attributes
(bfd *, struct bfd_link_info *);
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index 0a6e66569ba..5fc9c33f9a1 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -2899,7 +2899,7 @@ elf32_arc_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
string or both. */
static int
-elf32_arc_obj_attrs_arg_type (int tag)
+elf32_arc_obj_attrs_arg_type (obj_attr_tag_t tag)
{
if (tag == Tag_ARC_CPU_name
|| tag == Tag_ARC_ISA_config
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index c913f2b4c7d..6333f9d6b5b 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14089,7 +14089,7 @@ enum
string or both. */
static int
-elf32_arm_obj_attrs_arg_type (int tag)
+elf32_arm_obj_attrs_arg_type (obj_attr_tag_t tag)
{
if (tag == Tag_compatibility)
return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL;
diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
index 47a63895b55..f9ef8cc931d 100644
--- a/bfd/elf32-csky.c
+++ b/bfd/elf32-csky.c
@@ -5255,7 +5255,7 @@ csky_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
string or both. */
static int
-elf32_csky_obj_attrs_arg_type (int tag)
+elf32_csky_obj_attrs_arg_type (obj_attr_tag_t tag)
{
switch (tag)
{
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 77099655aba..15ba6adba85 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -2679,7 +2679,7 @@ elf32_msp430_obj_attrs_handle_unknown (bfd *abfd, int tag)
string or both. */
static int
-elf32_msp430_obj_attrs_arg_type (int tag)
+elf32_msp430_obj_attrs_arg_type (obj_attr_tag_t tag)
{
if (tag == Tag_compatibility)
return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL;
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 0adab1acc07..e96cfe1d9dd 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -3462,7 +3462,7 @@ elf32_tic6x_plt_sym_val (bfd_vma i, const asection *plt,
}
static int
-elf32_tic6x_obj_attrs_arg_type (int tag)
+elf32_tic6x_obj_attrs_arg_type (obj_attr_tag_t tag)
{
if (tag == Tag_ABI_compatibility)
return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL;
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 790f0397cf5..4b80f228265 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -5831,7 +5831,7 @@ riscv_elf_object_p (bfd *abfd)
string or both. */
static int
-riscv_elf_obj_attrs_arg_type (int tag)
+riscv_elf_obj_attrs_arg_type (obj_attr_tag_t tag)
{
return (tag & 1) != 0 ? ATTR_TYPE_FLAG_STR_VAL : ATTR_TYPE_FLAG_INT_VAL;
}
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index 368594d3a04..1db3e0ae6ef 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -2061,23 +2061,47 @@ skip_past_char (char ** str, char c)
/* A list of attributes that have been explicitly set by the assembly code.
VENDOR is the vendor id, BASE is the tag shifted right by the number
of bits in MASK, and bit N of MASK is set if tag BASE+N has been set. */
-struct recorded_attribute_info {
+typedef struct recorded_attribute_info {
struct recorded_attribute_info *next;
- int vendor;
+ obj_attr_vendor vendor;
unsigned int base;
unsigned long mask;
-};
-static struct recorded_attribute_info *recorded_attributes;
+} recorded_attribute_info;
+static recorded_attribute_info *recorded_attributes;
+
+static void
+oav1_attr_info_free (recorded_attribute_info *node)
+{
+ recorded_attribute_info *next;
+ while (node != NULL)
+ {
+ next = node->next;
+ free (node);
+ node = next;
+ }
+}
+
+static void
+oav1_attr_info_init (void)
+{
+ recorded_attributes = NULL;
+}
+
+static void
+oav1_attr_info_exit (void)
+{
+ oav1_attr_info_free (recorded_attributes);
+}
/* Record that we have seen an explicit specification of attribute TAG
for vendor VENDOR. */
static void
-record_attribute (int vendor, unsigned int tag)
+oav1_attr_record_seen (obj_attr_vendor vendor, obj_attr_tag_t tag)
{
unsigned int base;
unsigned long mask;
- struct recorded_attribute_info *rai;
+ recorded_attribute_info *rai;
base = tag / (8 * sizeof (rai->mask));
mask = 1UL << (tag % (8 * sizeof (rai->mask)));
@@ -2088,7 +2112,7 @@ record_attribute (int vendor, unsigned int tag)
return;
}
- rai = XNEW (struct recorded_attribute_info);
+ rai = XNEW (recorded_attribute_info);
rai->next = recorded_attributes;
rai->vendor = vendor;
rai->base = base;
@@ -2100,11 +2124,11 @@ record_attribute (int vendor, unsigned int tag)
for vendor VENDOR. */
bool
-obj_elf_seen_attribute (int vendor, unsigned int tag)
+oav1_attr_seen (obj_attr_vendor vendor, obj_attr_tag_t tag)
{
unsigned int base;
unsigned long mask;
- struct recorded_attribute_info *rai;
+ recorded_attribute_info *rai;
base = tag / (8 * sizeof (rai->mask));
mask = 1UL << (tag % (8 * sizeof (rai->mask)));
@@ -2117,8 +2141,8 @@ obj_elf_seen_attribute (int vendor, unsigned int tag)
/* Parse an attribute directive for VENDOR.
Returns the attribute number read, or zero on error. */
-int
-obj_elf_vendor_attribute (int vendor)
+obj_attr_tag_t
+obj_attr_v1_process_attribute (obj_attr_vendor vendor)
{
expressionS exp;
int type;
@@ -2196,7 +2220,7 @@ obj_elf_vendor_attribute (int vendor)
s = demand_copy_C_string (&len);
}
- record_attribute (vendor, tag);
+ oav1_attr_record_seen (vendor, tag);
bool ok = false;
switch (type & 3)
{
@@ -2233,7 +2257,7 @@ obj_elf_vendor_attribute (int vendor)
static void
obj_elf_gnu_attribute (int ignored ATTRIBUTE_UNUSED)
{
- obj_elf_vendor_attribute (OBJ_ATTR_GNU);
+ obj_attr_v1_process_attribute (OBJ_ATTR_GNU);
}
void
@@ -3166,6 +3190,8 @@ elf_begin (void)
previous_subsection = 0;
comment_section = NULL;
memset (&groups, 0, sizeof (groups));
+
+ oav1_attr_info_init ();
}
void
@@ -3177,17 +3203,12 @@ elf_end (void)
section_stack = top->next;
free (top);
}
- while (recorded_attributes)
- {
- struct recorded_attribute_info *rai = recorded_attributes;
- recorded_attributes = rai->next;
- free (rai);
- }
if (groups.indexes)
{
htab_delete (groups.indexes);
free (groups.head);
}
+ oav1_attr_info_exit ();
}
#ifdef USE_EMULATIONS
diff --git a/gas/config/obj-elf.h b/gas/config/obj-elf.h
index 1e0ac588ceb..a064a4da2f5 100644
--- a/gas/config/obj-elf.h
+++ b/gas/config/obj-elf.h
@@ -204,9 +204,10 @@ extern void obj_elf_vtable_inherit (int);
extern void obj_elf_vtable_entry (int);
extern struct fix * obj_elf_get_vtable_inherit (void);
extern struct fix * obj_elf_get_vtable_entry (void);
-extern bool obj_elf_seen_attribute
- (int, unsigned int);
-extern int obj_elf_vendor_attribute (int);
+
+/* Object attributes v1. */
+extern bool oav1_attr_seen (obj_attr_vendor, obj_attr_tag_t);
+extern obj_attr_tag_t obj_attr_v1_process_attribute (obj_attr_vendor);
/* BFD wants to write the udata field, which is a no-no for the
predefined section symbols in bfd/section.c. They are read-only. */
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 30d6cb9c50d..5d78a284527 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -4928,7 +4928,7 @@ arc_extcorereg (int opertype)
static void
arc_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_PROC);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_PROC);
if (tag < NUM_KNOWN_OBJ_ATTRIBUTES)
attributes_set_explicitly[tag] = true;
@@ -4937,7 +4937,7 @@ arc_attribute (int ignored ATTRIBUTE_UNUSED)
/* Set an attribute if it has not already been set by the user. */
static void
-arc_set_attribute_int (int tag, int value)
+arc_set_attribute_int (obj_attr_tag_t tag, int value)
{
if (tag < 1
|| tag >= NUM_KNOWN_OBJ_ATTRIBUTES
@@ -4948,7 +4948,7 @@ arc_set_attribute_int (int tag, int value)
}
static void
-arc_set_attribute_string (int tag, const char *value)
+arc_set_attribute_string (obj_attr_tag_t tag, const char *value)
{
if (tag < 1
|| tag >= NUM_KNOWN_OBJ_ATTRIBUTES
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 13afe8d3e48..3f8f9f777a8 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -4972,9 +4972,9 @@ s_arm_unwind_raw (int ignored ATTRIBUTE_UNUSED)
static void
s_arm_eabi_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_PROC);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_PROC);
- if (tag >= 0 && tag < NUM_KNOWN_OBJ_ATTRIBUTES)
+ if (tag < NUM_KNOWN_OBJ_ATTRIBUTES)
attributes_set_explicitly[tag] = 1;
}
@@ -32135,7 +32135,7 @@ static const cpu_arch_ver_table cpu_arch_ver[] =
/* Set an attribute if it has not already been set by the user. */
static void
-aeabi_set_attribute_int (int tag, int value)
+aeabi_set_attribute_int (obj_attr_tag_t tag, int value)
{
if (tag < 1
|| tag >= NUM_KNOWN_OBJ_ATTRIBUTES
@@ -32146,7 +32146,7 @@ aeabi_set_attribute_int (int tag, int value)
}
static void
-aeabi_set_attribute_string (int tag, const char *value)
+aeabi_set_attribute_string (obj_attr_tag_t tag, const char *value)
{
if (tag < 1
|| tag >= NUM_KNOWN_OBJ_ATTRIBUTES
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 510a1bcc65f..70e993e3e55 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -7917,7 +7917,7 @@ m68k_elf_cons (int nbytes /* 4=.long */)
static void
m68k_elf_gnu_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_GNU);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_GNU);
/* Check validity of defined m68k tags. */
if (tag == Tag_GNU_M68K_ABI_FP)
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 5e602a47a4e..ff2cfa180e8 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -20596,7 +20596,7 @@ mips_md_finish (void)
file_mips_check_options ();
/* Set a floating-point ABI if the user did not. */
- if (obj_elf_seen_attribute (OBJ_ATTR_GNU, Tag_GNU_MIPS_ABI_FP))
+ if (obj_attr_v1_rai_seen (OBJ_ATTR_GNU, Tag_GNU_MIPS_ABI_FP))
{
/* Perform consistency checks on the floating-point ABI. */
fpabi = bfd_elf_get_obj_attr_int (stdoutput, OBJ_ATTR_GNU,
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 714dfca4670..ebd9da801a8 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -2577,7 +2577,7 @@ ppc_elf_abiversion (int ignore ATTRIBUTE_UNUSED)
static void
ppc_elf_gnu_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_GNU);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_GNU);
/* Check validity of defined powerpc tags. */
if (tag == Tag_GNU_Power_ABI_FP
diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index d0030de4681..c5dca146b73 100644
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -5792,7 +5792,7 @@ riscv_convert_symbolic_attribute (const char *name)
static const struct
{
const char *name;
- const int tag;
+ const obj_attr_tag_t tag;
}
attribute_table[] =
{
@@ -5824,7 +5824,7 @@ riscv_convert_symbolic_attribute (const char *name)
static void
s_riscv_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_PROC);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_PROC);
unsigned old_xlen;
obj_attribute *attr;
diff --git a/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c
index aeb22395b05..61102f5e8d4 100644
--- a/gas/config/tc-tic6x.c
+++ b/gas/config/tc-tic6x.c
@@ -689,7 +689,7 @@ static bool tic6x_attributes_set_explicitly[NUM_KNOWN_OBJ_ATTRIBUTES];
static void
s_tic6x_c6xabi_attribute (int ignored ATTRIBUTE_UNUSED)
{
- int tag = obj_elf_vendor_attribute (OBJ_ATTR_PROC);
+ obj_attr_tag_t tag = obj_attr_v1_process_attribute (OBJ_ATTR_PROC);
if (tag < NUM_KNOWN_OBJ_ATTRIBUTES)
tic6x_attributes_set_explicitly[tag] = true;
@@ -698,7 +698,7 @@ s_tic6x_c6xabi_attribute (int ignored ATTRIBUTE_UNUSED)
typedef struct
{
const char *name;
- int tag;
+ obj_attr_tag_t tag;
} tic6x_attribute_table;
static const tic6x_attribute_table tic6x_attributes[] =
@@ -4375,7 +4375,7 @@ tic6x_frag_init (fragS *fragp)
/* Set an attribute if it has not already been set by the user. */
static void
-tic6x_set_attribute_int (int tag, int value)
+tic6x_set_attribute_int (obj_attr_tag_t tag, int value)
{
if (tag < 1
|| tag >= NUM_KNOWN_OBJ_ATTRIBUTES)
--
2.50.0
More information about the Binutils
mailing list