From patchwork Tue May 4 15:15:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43255 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 59C4F3992417; Tue, 4 May 2021 15:15:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59C4F3992417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620141342; bh=YBEtzujAD4Jk/n3x/KJjy76/K3ASy3fj6xGYb8rdlxs=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Yi9J6FXh5Rf4pPpAcPQps3/hhaG24RFscYYprFOQO/WzN9vu1Y6ynDtutH4T4BSbD mWmChQVOKHId2imUayv2DGhpgtUGRZJsiFdAzf33PV2FFjwVlDbZ77azXxZ1zu5GQt Mzld9gBn+dDdLtREOC90vMq6cnVc3HiFcA958QSs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id AF7C43968C0A for ; Tue, 4 May 2021 15:15:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AF7C43968C0A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-vA2MxTQdMYmJD4ShC6DXng-1; Tue, 04 May 2021 11:15:34 -0400 X-MC-Unique: vA2MxTQdMYmJD4ShC6DXng-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E56AF192AB7B for ; Tue, 4 May 2021 15:15:33 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 471BD5D9D5 for ; Tue, 4 May 2021 15:15:33 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/2] scripts/versions.awk: Add strings and hashes to In-Reply-To: References: Message-Id: Date: Tue, 04 May 2021 17:15:48 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This generates new macros of this from: #define FIRST_VERSION_libc___pthread_mutex_lock_STRING "GLIBC_2.2.5" #define FIRST_VERSION_libc___pthread_mutex_lock_HASH 0x9691a75 They are useful for symbol lookups using _dl_lookup_direct. --- scripts/versions.awk | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/scripts/versions.awk b/scripts/versions.awk index d56f4e712c..3291123666 100644 --- a/scripts/versions.awk +++ b/scripts/versions.awk @@ -32,6 +32,29 @@ BEGIN { sort = "sort -t. -k 1,1 -k 2n,2n -k 3 > " tmpfile; } +# GNU awk does not implement the ord and chr functions. +# +# says that they are "written very nicely", using code similar to what +# is included here. +function chr(c) { + return sprintf("%c", c) +} + +BEGIN { + for (c = 1; c < 127; c++) { + ord_table[chr(c)] = c; + } +} + +function ord(c) { + if (ord_table[c]) { + return ord_table[c]; + } else { + printf("Invalid character reference: '%c'\n", c) > "/dev/stderr"; + ++lossage; + } +} + # Remove comment lines. /^ *#/ { next; @@ -90,6 +113,17 @@ function close_and_move(name, real_name) { system(move_if_change " " name " " real_name " >&2"); } +# ELF hash, for use with symbol versions. +function elf_hash(s, i, acc) { + acc = 0; + for (i = 1; i <= length(s); ++i) { + acc = and(lshift(acc, 4) + ord(substr(s, i, 1)), 0xffffffff); + top = and(acc, 0xf0000000); + acc = and(xor(acc, rshift(top, 24)), compl(top)); + } + return acc; +} + # Now print the accumulated information. END { close(sort); @@ -145,6 +179,8 @@ END { && oldver ~ "^GLIBC_[0-9]" \ && sym ~ "^[A-Za-z0-9_]*$") { ver_val = oldver; + printf("#define %s_STRING \"%s\"\n", first_ver_macro, ver_val) > first_ver_header; + printf("#define %s_HASH 0x%x\n", first_ver_macro, elf_hash(ver_val)) > first_ver_header; gsub("\\.", "_", ver_val); printf("#define %s %s\n", first_ver_macro, ver_val) > first_ver_header; first_ver_seen[first_ver_macro] = 1;