Skip to content

Commit

Permalink
checkabi/storeabi relevant only to x86_64
Browse files Browse the repository at this point in the history
The stored ABI files are for the x86_64 architecture.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: szubersk <szuberskidamian@gmail.com>
Closes openzfs#11345
Closes openzfs#13104
  • Loading branch information
szubersk authored and andrewc12 committed Aug 30, 2022
1 parent fe82bc3 commit 6503887
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
14 changes: 2 additions & 12 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,10 @@ SHELLCHECKSCRIPTS = autogen.sh

PHONY += checkabi storeabi

checklibabiversion:
libabiversion=`abidw -v | $(SED) 's/[^0-9]//g'`; \
if test $$libabiversion -lt "200"; then \
/bin/echo -e "\n" \
"*** Please use libabigail 2.0.0 version or newer;\n" \
"*** otherwise results are not consistent!\n" \
"(or see https://github.com/openzfs/libabigail-docker )\n"; \
exit 1; \
fi;

checkabi: checklibabiversion lib
checkabi: lib
$(MAKE) -C lib checkabi

storeabi: checklibabiversion lib
storeabi: lib
$(MAKE) -C lib storeabi

PHONY += mancheck
Expand Down
25 changes: 22 additions & 3 deletions config/Abigail.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,32 @@
# a mechanism for suppressing harmless warnings.
#

PHONY += checkabi storeabi
PHONY += checkabi storeabi check_libabi_version allow_libabi_only_for_x86_64

checkabi:
check_libabi_version:
libabiversion=`abidw -v | $(SED) 's/[^0-9]//g'`; \
if test $$libabiversion -lt "200"; then \
/bin/echo -e "\n" \
"*** Please use libabigail 2.0.0 version or newer;\n" \
"*** otherwise results are not consistent!\n" \
"(or see https://github.com/openzfs/libabigail-docker )\n"; \
exit 1; \
fi;

allow_libabi_only_for_x86_64:
echo '*** ABI definitions provided apply only to x86_64 architecture'
echo '*** Skipping `checkabi`/`storeabi` target and assuming success.'

if TARGET_CPU_X86_64
checkabi: check_libabi_version
for lib in $(lib_LTLIBRARIES) ; do \
abidiff --no-unreferenced-symbols \
--headers-dir1 ../../include \
--suppressions $${lib%.la}.suppr \
$${lib%.la}.abi .libs/$${lib%.la}.so ; \
done

storeabi:
storeabi: check_libabi_version
cd .libs ; \
for lib in $(lib_LTLIBRARIES) ; do \
abidw --no-show-locs \
Expand All @@ -31,3 +46,7 @@ storeabi:
--type-id-style hash \
$${lib%.la}.so > ../$${lib%.la}.abi ; \
done
else
checkabi: allow_libabi_only_for_x86_64
storeabi: allow_libabi_only_for_x86_64
endif

0 comments on commit 6503887

Please sign in to comment.