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.133.124]) by sourceware.org (Postfix) with ESMTPS id 10E8B385354E for ; Thu, 1 Sep 2022 05:30:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 10E8B385354E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662010251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=vXNDbxxdHuB/YBCpPa3O+pAx58IlkVo0V+/QeX6OyeU=; b=MO56Xfx1dpFOPdbL9xbW/OMmRpGZcztEfIYZTHf/m05EAFMUyVA20s6+IA3CQVLX9YiMKZ Vrs9zGlerRREtAtcosIMq6AK6Bq49pvQr4KD7joHuDU7XG2qDVrOaxctt35oMH1rAEeL0X DlGa61m6HVuMvqSh6R6+RGczJJHd3Gk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-118-VaFyjSIgOP2I6h5ynKlMXQ-1; Thu, 01 Sep 2022 01:30:50 -0400 X-MC-Unique: VaFyjSIgOP2I6h5ynKlMXQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D13829AB44D for ; Thu, 1 Sep 2022 05:30:50 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8745A492C3B for ; Thu, 1 Sep 2022 05:30:49 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] elf.h: Remove duplicate definition of VER_FLG_WEAK Date: Thu, 01 Sep 2022 07:30:47 +0200 Message-ID: <87r10vr794.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This did not cause a warning before because the token sequence for the two definitions was identical. --- elf/elf.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/elf/elf.h b/elf/elf.h index 065deca83c..273305a7cd 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -1064,7 +1064,8 @@ typedef struct /* Legal values for vd_flags (version information flags). */ #define VER_FLG_BASE 0x1 /* Version definition of file itself */ -#define VER_FLG_WEAK 0x2 /* Weak version identifier */ +#define VER_FLG_WEAK 0x2 /* Weak version identifier. Also + used by vna_flags below. */ /* Versym symbol index values. */ #define VER_NDX_LOCAL 0 /* Symbol is local. */ @@ -1142,10 +1143,6 @@ typedef struct } Elf64_Vernaux; -/* Legal values for vna_flags. */ -#define VER_FLG_WEAK 0x2 /* Weak version identifier */ - - /* Auxiliary vector. */ /* This vector is normally only used by the program interpreter. The base-commit: 4d3b77f020c2accf72af7a54f207d225c61db9bf