diff --git a/README.md b/README.md index 7c868c9061..d7b900dded 100644 --- a/README.md +++ b/README.md @@ -285,7 +285,7 @@ $ git commit -m "libnvme: regenerate accessors following 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 diff --git a/libnvme/src/nvme/accessors.ld b/libnvme/src/nvme/accessors.ld index 2fe00c6101..5a208afeb4 100644 --- a/libnvme/src/nvme/accessors.ld +++ b/libnvme/src/nvme/accessors.ld @@ -1,5 +1,5 @@ -LIBNVME_ACCESSORS_3_0 { +LIBNVME_ACCESSORS_3 { global: nvme_path_get_name; nvme_path_set_name; diff --git a/libnvme/src/nvme/generate-accessors.c b/libnvme/src/nvme/generate-accessors.c index 21eea5e224..d37d784271 100644 --- a/libnvme/src/nvme/generate-accessors.c +++ b/libnvme/src/nvme/generate-accessors.c @@ -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 */ diff --git a/libnvme/src/nvme/update-accessors.sh b/libnvme/src/nvme/update-accessors.sh index 77287c21c6..5621fc869e 100755 --- a/libnvme/src/nvme/update-accessors.sh +++ b/libnvme/src/nvme/update-accessors.sh @@ -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. # @@ -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: