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