From 0478e1f3928bfaa34eb910ba2cbaf1dda8f84aab Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Wed, 10 Aug 2022 13:34:28 +0700 Subject: [PATCH] Avoid adding multiple version tags to the same symbol This is apparently forbidden in most versions of binutils. --- lib/filter.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- a/lib/filter.c +++ b/lib/filter.c @@ -303,21 +303,25 @@ pci_filter_match_v30(struct pci_filter_v // (their positions in struct pci_filter were declared as RFU). STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); +DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38); SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); -SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); +SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3); SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); +DEFINE_ALIAS(char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str), pci_filter_parse_slot_v38); SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); -SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); +SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@LIBPCI_3.3); SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); +DEFINE_ALIAS(char *pci_filter_parse_id_v33(struct pci_filter *f, char *str), pci_filter_parse_id_v38); SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); -SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); +SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@LIBPCI_3.3); SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); +DEFINE_ALIAS(int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38); SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); -SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); +SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@LIBPCI_3.3); SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8);