From patchwork Sun Feb 25 18:39:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 86342 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 75B6D3858C42 for ; Sun, 25 Feb 2024 18:42:12 +0000 (GMT) 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 35E3C3858C98 for ; Sun, 25 Feb 2024 18:40:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 35E3C3858C98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 35E3C3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886420; cv=none; b=fDu71iCPdUjEct95VqWj8DxXMhkzPdj2Vx71BJOJ6oyQgKKhAgw4G3Sbu6InVXS+vl5qI/a4kPmvcdhGXC5S31JsKM43uzmlT1QH+WebvjG4vNtjiNdteRF2wDzrQfxGpaanH0l0yoDv4IEcqHqF4xzxVoPwwasJp6M4lXwwDYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886420; c=relaxed/simple; bh=/Wsm4zoujOpP8jc31kruqJRQlaxdT2iVhV2xMy59GGY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=YNRX1JtOSgYs9zoiFPFqmqjgs/gLGb6pNwMqKpHZCBKHSPrXkCjBZojgvkHLAWPzpluK23m7bBA9GSOB7oqJd4revCe5dLq2jZ7BxP+1kygzMlfGdIBfOwL7SNxTrpgoHUXZxFqB5yS6EC4qny496LDV9Yon8Wsem524HCaqLEY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TQEbjk+kQQXbF0tnfwJ1g39hZB4aWbULbdzpIMxcYQI=; b=TgGNa/ovoDgq3vrXCjbTzC/BZWUVBbSlS7MOOS1rCVUFh35G+g/hR3xPhWY2OInDUwalPX C3MUwNFxzWv8fOJb9APKRR2tL13Z3ek6wD/Fh+TSz8GPHwSNalKlNvDZKTdfTYVEg9//XO et8Naf46N8tmWpUNoY1Eycau61k6O3c= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-UAOksAStMbqKNAmERrAZmQ-1; Sun, 25 Feb 2024 13:40:17 -0500 X-MC-Unique: UAOksAStMbqKNAmERrAZmQ-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42e7f946215so6918371cf.2 for ; Sun, 25 Feb 2024 10:40:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886416; x=1709491216; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TQEbjk+kQQXbF0tnfwJ1g39hZB4aWbULbdzpIMxcYQI=; b=ptk5IsKfdjZkDzkNjNc+/XhqkLD9I/oyXZ/QTxD/7tSp9q3jR8WlkOvOUPc+Vs5wlr CIogp/uBupy+tpyohoiUZKe1tC+zn8MeHtdthev+M+tEK5xU1/G3r1AvBfTesQf9Qc8X LRNPdWL1v2YR2JUgHk/RsRDwp8DSzkGEwCWcNqt8Ixnq0npzH/AHzMDjtqfQJLYX/zRy LU/xEXYYsBvXfXRUaDrPbWtKyemOweb4S5FW9KEdDC0FWPJYFKNKfKHZv3IfxsVLUXo1 QYKBRfg1baQNfEv6kegXumyXZRR8UQKFXaBlBHkj4X6GUdb3iBVbdjsArCdHK38mj/wt w6vA== X-Gm-Message-State: AOJu0Ywr/p7PTWJ2HBjNoF4hZUmy6C4AzpLk4NWK0LvkpMSgGRzo1HF8 aSh2qFS1QxABepP6CohhByZBMangk61ylTr3WER3wkygIhg9hmX2e/fg3Cf+96yhWjn+6XPpgby nVu8BYDEX4m41FnwUCgUBKD43hjtpIf02ZxOHOAaUPCiiDljhACnGZAFlJeZaBWSErSK+2bpcVH IGY2Z8umPxaEWEPtrfn1fFujSP5q96Hbv8lXmtRsU= X-Received: by 2002:a05:622a:1b9f:b0:42e:58c6:bc9e with SMTP id bp31-20020a05622a1b9f00b0042e58c6bc9emr5901320qtb.60.1708886416735; Sun, 25 Feb 2024 10:40:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuFhZTIj2wtDo1h6KhftpdKjbqvyvdRk1pZFn3l1HmOJKL6ThTqERyMWFdJc7I1PKGmiyVhA== X-Received: by 2002:a05:622a:1b9f:b0:42e:58c6:bc9e with SMTP id bp31-20020a05622a1b9f00b0042e58c6bc9emr5901308qtb.60.1708886416493; Sun, 25 Feb 2024 10:40:16 -0800 (PST) Received: from localhost.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id y8-20020ac87088000000b0042e6ad88de0sm1643975qto.73.2024.02.25.10.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:15 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 05/10] dlfcn: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:44 -0500 Message-ID: <20240225183956.2534939-5-carlos@redhat.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240225183956.2534939-1-carlos@redhat.com> References: <20240225183956.2534939-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Reflow and sort Makefile. No code generation changes in non-test binary artifacts. No regressions on x86_64 and i686. --- dlfcn/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/dlfcn/Makefile b/dlfcn/Makefile index 6944fb3610..d473773dd4 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -19,7 +19,11 @@ subdir := dlfcn include ../Makeconfig -headers := bits/dlfcn.h bits/dl_find_object.h dlfcn.h +headers := \ + bits/dl_find_object.h \ + bits/dlfcn.h \ + dlfcn.h \ + # headers extra-libs := libdl libdl-routines := libdl-compat routines = \ @@ -33,6 +37,7 @@ routines = \ dlsym \ dlvsym \ libc_dlerror_result \ + # routines extra-libs-others := libdl @@ -49,24 +54,69 @@ shared-only-routines := dlopenold endif ifeq (yes,$(build-shared)) -tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \ - bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \ - bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen +tests = \ + bug-atexit1 \ + bug-atexit2 \ + bug-atexit3 \ + bug-dl-leaf \ + bug-dlopen1 \ + bug-dlsym1 \ + default \ + errmsg1 \ + failtest \ + glrefmain \ + tst-dladdr \ + tst-dlinfo \ + tst-rec-dlopen \ + tstatexit \ + tstcxaatexit \ + # tests endif -modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \ - defaultmod2 errmsg1mod modatexit modcxaatexit \ - bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \ - bug-atexit2-lib bug-dl-leaf-lib \ - bug-dl-leaf-lib-cb moddummy1 moddummy2 +modules-names = \ + bug-atexit1-lib \ + bug-atexit2-lib \ + bug-dl-leaf-lib \ + bug-dl-leaf-lib-cb \ + bug-dlsym1-lib1 \ + bug-dlsym1-lib2 \ + defaultmod1 \ + defaultmod2 \ + errmsg1mod \ + failtestmod \ + glreflib1 \ + glreflib2 \ + glreflib3 \ + modatexit \ + modcxaatexit \ + moddummy1 \ + moddummy2 \ + # modules-names failtestmod.so-no-z-defs = yes glreflib2.so-no-z-defs = yes errmsg1mod.so-no-z-defs = yes ifeq (yes,$(build-shared)) -tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5 -tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5 -modules-names += modstatic modstatic2 modstatic3 modstatic5 +tests += \ + tststatic \ + tststatic2 \ + tststatic3 \ + tststatic4 \ + tststatic5 \ + # tests +tests-static += \ + tststatic \ + tststatic2 \ + tststatic3 \ + tststatic4 \ + tststatic5 \ + # tests-static +modules-names += \ + modstatic \ + modstatic2 \ + modstatic3 \ + modstatic5 \ + # modules-names tststatic-ENV = LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)elf tststatic2-ENV = $(tststatic-ENV) tststatic3-ENV = $(tststatic-ENV)