Skip to content

Commit a05a6b4

Browse files
Martin Belangerigaw
authored andcommitted
build: rename LIBNVME_ACCESSORS_3_0 to LIBNVME_ACCESSORS_3
This is for consistency with libnvme.ld. libnvme.ld defines LIBNVME_3 (and not LIBNVME_3_0), therefore accessors.ld should define LIBNVME_ACCESSORS_3 w/o the "_0" suffix. Signed-off-by: Martin Belanger <[email protected]>
1 parent 751d26d commit a05a6b4

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ $ git commit -m "libnvme: regenerate accessors following <struct> changes"
285285

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

290290
This file is **not** updated automatically, because each symbol must be placed
291291
in the correct version section by the maintainer. Adding a symbol to an

libnvme/src/nvme/accessors.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
LIBNVME_ACCESSORS_3_0 {
2+
LIBNVME_ACCESSORS_3 {
33
global:
44
nvme_path_get_name;
55
nvme_path_set_name;

libnvme/src/nvme/generate-accessors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,7 @@ int main(int argc, char *argv[])
20962096
generated_ld = fopen(conf.l_fname, "w");
20972097
fprintf(generated_ld,
20982098
"\n"
2099-
"LIBNVME_ACCESSORS_3_0 {\n"
2099+
"LIBNVME_ACCESSORS_3 {\n"
21002100
" global:\n");
21012101

21022102
/* Copy temporary file to output */

libnvme/src/nvme/update-accessors.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# produces different output.
1515
#
1616
# accessors.ld is NOT updated automatically because its version section labels
17-
# (e.g. LIBNVME_ACCESSORS_3_0) must be assigned by the maintainer. Instead,
17+
# (e.g. LIBNVME_ACCESSORS_3) must be assigned by the maintainer. Instead,
1818
# this script reports which symbols have been added or removed so the maintainer
1919
# knows exactly what to change in accessors.ld.
2020
#
@@ -78,7 +78,7 @@ fi
7878
# Compare symbol lists to detect accessors.ld drift.
7979
#
8080
# accessors.ld is manually maintained because its version section labels
81-
# (e.g. LIBNVME_ACCESSORS_3_0) must be assigned by a human. We therefore
81+
# (e.g. LIBNVME_ACCESSORS_3) must be assigned by a human. We therefore
8282
# only report what has changed; we never overwrite the file.
8383
#
8484
# Symbol lines in an ld version script look like:

0 commit comments

Comments
 (0)