diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-07-29 11:13:57 -0300 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2022-03-29 17:02:26 -0400 |
| commit | e798a21fef1571bde6a3db549c68e33a5d781a3e (patch) | |
| tree | 5e3070823c46baa0c64e4d3f9fcd9740b401ca50 | |
| parent | faedaa0f9a802820fb0f04e9d568db1e15326213 (diff) | |
| download | glibc-e798a21fef1571bde6a3db549c68e33a5d781a3e.tar glibc-e798a21fef1571bde6a3db549c68e33a5d781a3e.tar.gz glibc-e798a21fef1571bde6a3db549c68e33a5d781a3e.tar.bz2 glibc-e798a21fef1571bde6a3db549c68e33a5d781a3e.zip | |
elf: Move LAV_CURRENT to link_lavcurrent.h
No functional change.
(cherry picked from commit 54816ae98d57930b7c945f17485714a5574bfe47)
Resolved conflicts:
elf/Makefile
| -rw-r--r-- | bits/link_lavcurrent.h | 25 | ||||
| -rw-r--r-- | elf/Makefile | 1 | ||||
| -rw-r--r-- | elf/link.h | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/bits/link_lavcurrent.h b/bits/link_lavcurrent.h new file mode 100644 index 0000000000..44fbea1e80 --- /dev/null +++ b/bits/link_lavcurrent.h @@ -0,0 +1,25 @@ +/* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. LAV_CURRENT definition. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#ifndef _LINK_H +# error "Never include <bits/link_lavcurrent.h> directly; use <link.h> instead." +#endif + +/* Version numbers for la_version handshake interface. */ +#define LAV_CURRENT 1 diff --git a/elf/Makefile b/elf/Makefile index 54b91f8668..252841f6e5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -24,6 +24,7 @@ include ../Makeconfig headers = \ bits/elfclass.h \ bits/link.h \ + bits/link_lavcurrent.h \ elf.h \ link.h \ # headers diff --git a/elf/link.h b/elf/link.h index ff3a85c847..21a351686b 100644 --- a/elf/link.h +++ b/elf/link.h @@ -96,7 +96,7 @@ struct link_map #ifdef __USE_GNU /* Version numbers for la_version handshake interface. */ -#define LAV_CURRENT 1 +#include <bits/link_lavcurrent.h> /* Activity types signaled through la_activity. */ enum |