|
 |
076f82 |
commit a31bbe3242266aaea423e5879f38aed69aea1d5e
|
|
|
076f82 |
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
076f82 |
Date: Thu Jul 29 11:13:57 2021 -0300
|
|
|
076f82 |
|
|
|
076f82 |
elf: Move LAV_CURRENT to link_lavcurrent.h
|
|
|
076f82 |
|
|
|
076f82 |
No functional change.
|
|
|
076f82 |
|
|
|
076f82 |
(cherry picked from commit 54816ae98d57930b7c945f17485714a5574bfe47)
|
|
|
076f82 |
|
|
|
076f82 |
Resolved conflicts:
|
|
|
076f82 |
elf/Makefile
|
|
|
076f82 |
|
|
|
076f82 |
diff --git a/bits/link_lavcurrent.h b/bits/link_lavcurrent.h
|
|
|
076f82 |
new file mode 100644
|
|
|
076f82 |
index 0000000000000000..44fbea1e8060997f
|
|
|
076f82 |
--- /dev/null
|
|
|
076f82 |
+++ b/bits/link_lavcurrent.h
|
|
|
076f82 |
@@ -0,0 +1,25 @@
|
|
|
076f82 |
+/* Data structure for communication from the run-time dynamic linker for
|
|
|
076f82 |
+ loaded ELF shared objects. LAV_CURRENT definition.
|
|
|
076f82 |
+ Copyright (C) 2021 Free Software Foundation, Inc.
|
|
|
076f82 |
+ This file is part of the GNU C Library.
|
|
|
076f82 |
+
|
|
|
076f82 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
076f82 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
076f82 |
+ License as published by the Free Software Foundation; either
|
|
|
076f82 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
076f82 |
+
|
|
|
076f82 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
076f82 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
076f82 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
076f82 |
+ Lesser General Public License for more details.
|
|
|
076f82 |
+
|
|
|
076f82 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
076f82 |
+ License along with the GNU C Library; if not, see
|
|
|
076f82 |
+ <https://www.gnu.org/licenses/>. */
|
|
|
076f82 |
+
|
|
|
076f82 |
+#ifndef _LINK_H
|
|
|
076f82 |
+# error "Never include <bits/link_lavcurrent.h> directly; use <link.h> instead."
|
|
|
076f82 |
+#endif
|
|
|
076f82 |
+
|
|
|
076f82 |
+/* Version numbers for la_version handshake interface. */
|
|
|
076f82 |
+#define LAV_CURRENT 1
|
|
|
076f82 |
diff --git a/elf/Makefile b/elf/Makefile
|
|
|
076f82 |
index cd8725c76f4cfb48..7fa80946ff3aae42 100644
|
|
|
076f82 |
--- a/elf/Makefile
|
|
|
076f82 |
+++ b/elf/Makefile
|
|
|
076f82 |
@@ -24,6 +24,7 @@ include ../Makeconfig
|
|
|
076f82 |
headers = \
|
|
|
076f82 |
bits/elfclass.h \
|
|
|
076f82 |
bits/link.h \
|
|
|
076f82 |
+ bits/link_lavcurrent.h \
|
|
|
076f82 |
elf.h \
|
|
|
076f82 |
link.h \
|
|
|
076f82 |
# headers
|
|
|
076f82 |
diff --git a/elf/link.h b/elf/link.h
|
|
|
076f82 |
index ff3a85c847930b9b..21a351686b9bf7c8 100644
|
|
|
076f82 |
--- a/elf/link.h
|
|
|
076f82 |
+++ b/elf/link.h
|
|
|
076f82 |
@@ -96,7 +96,7 @@ struct link_map
|
|
|
076f82 |
#ifdef __USE_GNU
|
|
|
076f82 |
|
|
|
076f82 |
/* Version numbers for la_version handshake interface. */
|
|
|
076f82 |
-#define LAV_CURRENT 1
|
|
|
076f82 |
+#include <bits/link_lavcurrent.h>
|
|
|
076f82 |
|
|
|
076f82 |
/* Activity types signaled through la_activity. */
|
|
|
076f82 |
enum
|