Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ $ git commit -m "libnvme: regenerate accessors following <struct> changes"

`accessors.ld` is a GNU linker version script that controls which accessor
symbols are exported from `libnvme.so` and under which ABI version label they
were introduced (e.g. `LIBNVME_ACCESSORS_3_0`).
were introduced (e.g. `LIBNVME_ACCESSORS_3`).

This file is **not** updated automatically, because each symbol must be placed
in the correct version section by the maintainer. Adding a symbol to an
Expand Down
2 changes: 1 addition & 1 deletion libnvme/src/nvme/accessors.ld
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

LIBNVME_ACCESSORS_3_0 {
LIBNVME_ACCESSORS_3 {
global:
nvme_path_get_name;
nvme_path_set_name;
Expand Down
2 changes: 1 addition & 1 deletion libnvme/src/nvme/generate-accessors.c
Original file line number Diff line number Diff line change
Expand Up @@ -2096,7 +2096,7 @@ int main(int argc, char *argv[])
generated_ld = fopen(conf.l_fname, "w");
fprintf(generated_ld,
"\n"
"LIBNVME_ACCESSORS_3_0 {\n"
"LIBNVME_ACCESSORS_3 {\n"
" global:\n");

/* Copy temporary file to output */
Expand Down
4 changes: 2 additions & 2 deletions libnvme/src/nvme/update-accessors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# produces different output.
#
# accessors.ld is NOT updated automatically because its version section labels
# (e.g. LIBNVME_ACCESSORS_3_0) must be assigned by the maintainer. Instead,
# (e.g. LIBNVME_ACCESSORS_3) must be assigned by the maintainer. Instead,
# this script reports which symbols have been added or removed so the maintainer
# knows exactly what to change in accessors.ld.
#
Expand Down Expand Up @@ -78,7 +78,7 @@ fi
# Compare symbol lists to detect accessors.ld drift.
#
# accessors.ld is manually maintained because its version section labels
# (e.g. LIBNVME_ACCESSORS_3_0) must be assigned by a human. We therefore
# (e.g. LIBNVME_ACCESSORS_3) must be assigned by a human. We therefore
# only report what has changed; we never overwrite the file.
#
# Symbol lines in an ld version script look like:
Expand Down