From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id F12DA385803D for ; Tue, 12 Apr 2022 18:42:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F12DA385803D Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-jZFJrcxVMvCnb62byOKC9Q-1; Tue, 12 Apr 2022 14:42:23 -0400 X-MC-Unique: jZFJrcxVMvCnb62byOKC9Q-1 Received: by mail-qt1-f200.google.com with SMTP id a24-20020ac81098000000b002e1e06a72aeso15447627qtj.6 for ; Tue, 12 Apr 2022 11:42:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t+YomA5a78X+qeVSiNmKxVLk/Lgqq/blpbZa+f0YekQ=; b=vsIouvZsgn2lofBCDUhjhGcPVrT3hqcdDeDTuTcmkXt7qeu84H/G62nnRc6I0TxNIF qcovzJuJcOIJgjfeDyvEDOUetakeFbU0/bTwTELEaIneCSI7pdMcrYdwvBlDoH8tBYgy nK5bw8ZnicRBdvvwRqXCpBoHiwhEwYRMNDLjXvC3BEV3fN2awSTcmuI9x5MDNrdG5ciO IsjYWdUeLcv7BYgwcyJR0UrzRZ3iGpZhkeGew+rQBJaCZuyz3fA3a8poh+iXwVvDxz7B vIrjVpqlzy0aLfQWA22bLb0/DiBsOya9LA6swU3AP6RcWCs0KSjuD8QVyrotJA4q4kTi 5x1A== X-Gm-Message-State: AOAM533vXa1KC4AuwClQ+gaPv3OoobAKF6cMDd/PQXhXKRVnMT55GE4m GsruThCA45p7GXN0Jesu2q4f8W3wKSXBpGcDWgmsgBTVDWi/gFJ4jISI96Qt4ZLaOOS7yORd1vn pSpv7oQtjq2oSn9oMo+jdM5RBchqw5GoHPVUJycP7b8s+0NdoMpPMIIb9lDbe9Zwp7ccExOw= X-Received: by 2002:ac8:440a:0:b0:2ed:133c:5c6b with SMTP id j10-20020ac8440a000000b002ed133c5c6bmr4417554qtn.1.1649788942359; Tue, 12 Apr 2022 11:42:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN93sd/citUhFyMalHVN7zJj3QazInZtQLXOfXzCAk5Q4qj1otm0jGznOLhT7Ycfwt/Zh5cw== X-Received: by 2002:ac8:440a:0:b0:2ed:133c:5c6b with SMTP id j10-20020ac8440a000000b002ed133c5c6bmr4417540qtn.1.1649788942049; Tue, 12 Apr 2022 11:42:22 -0700 (PDT) Received: from athas.redhat.com (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id j19-20020a05622a039300b002ecc2ebfd87sm10953840qtx.32.2022.04.12.11.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:42:21 -0700 (PDT) From: Carlos O'Donell To: libc-stable@sourceware.org Subject: [PATCH 06/27] elf: Move LAV_CURRENT to link_lavcurrent.h Date: Tue, 12 Apr 2022 14:41:44 -0400 Message-Id: <20220412184205.3343677-7-carlos@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412184205.3343677-1-carlos@redhat.com> References: <20220412184205.3343677-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: application/octet-stream; x-default=true X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 18:42:26 -0000 From: Adhemerval Zanella No functional change. (cherry picked from commit 54816ae98d57930b7c945f17485714a5574bfe47) Resolved conflicts: elf/Makefile --- bits/link_lavcurrent.h | 25 +++++++++++++++++++++++++ elf/Makefile | 1 + elf/link.h | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 bits/link_lavcurrent.h 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 + . */ + +#ifndef _LINK_H +# error "Never include directly; use instead." +#endif + +/* Version numbers for la_version handshake interface. */ +#define LAV_CURRENT 1 diff --git a/elf/Makefile b/elf/Makefile index af4ccb978c..e9cc85544d 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 /* Activity types signaled through la_activity. */ enum -- 2.35.1