From patchwork Sun Feb 25 18:39:40 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: 86335 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 ECE033858C56 for ; Sun, 25 Feb 2024 18:40:46 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id 106783858C5E for ; Sun, 25 Feb 2024 18:40:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 106783858C5E 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 106783858C5E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886415; cv=none; b=WgmqQ6g1nGvtaxv/DEpxM4gd4wJQfPLpKqUrZvpYxq8Yg1LZaMuTTgfghI/fVyqUc8qv6kjO+JmGLM78gUCwMbbn53BjL0+q7griUytwviI6eSZezLQjRRoTArentvYZJuNYXyoda31Q3jeQIcfzcv1TjK8rAnwHqiGqfw/sEVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886415; c=relaxed/simple; bh=89GAFP2djbEVpOiFbvbETo33+61SYEmbfxVUQnUS0h8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OfsLnvNF3ekSQQ0FQLtl4JsCVIu+4s6g7nbuLPD/ZOYgpxNgi9T7yVtv5ZepGGRcc/Fgf1EqTkUGh7kqV4s1W+/LmU6g5sGwr7h3SqDGLEJSQdxYHX5AwLWyfMEqggB47fc333UfUFrfWzT6yLCWRu5TB0kIKdyW1BMou1r29W4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886412; 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; bh=nchjeLAPmtCrDiDLK5ZVPJsx1w1K585FyFrn0QYfBms=; b=QEaMUuIwFVHuVauRSvq+BjOnF7neyR0c9SDWiMa44MP5caWnOOSBT34InJc4SPFDDc4D6r 3O+v6+XC/Ib43YZBUWR+Oh7zR9FkLURK9FR9BrsDzMxlRuJt04JB/Aw2o4Z//+vdxyGVvT i5JUXakB0CoGeIEJBaoZ1PM4+Ll8U0o= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-RT9bbTMlMKqlfbG-8GcYpg-1; Sun, 25 Feb 2024 13:40:11 -0500 X-MC-Unique: RT9bbTMlMKqlfbG-8GcYpg-1 Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-3c19b82746eso568036b6e.3 for ; Sun, 25 Feb 2024 10:40:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886410; x=1709491210; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nchjeLAPmtCrDiDLK5ZVPJsx1w1K585FyFrn0QYfBms=; b=MOdyu6Q0+7lXczpy0g8aBbKtlGKkA4XFVOWyU8sK8e2AQtCUNFPVD8VtuMKSpgw8q7 0tX6dIxvpaoApYYkRGiqW/7ELxYeR2qEsLIZ37Tob43tQrOu+VuhqKYHOlHFqQqyryKM ivukLYyWyhvk3L346gJNTRkL9ZF68dam+QL6o54IRVCWqZRafvTf3TGo+NcHhP84fvyn NglxO63o2qzcJXD6k0NC/e22CT5hNw5OCg+17WMXTbxUbtOUDB5ePQwbHYz0ICQvNoSq 9ESJiH3qvlPMaqhx443jAYqw9GyLrUS5qFAVJYh37kBxkOyjB8Z2fIGFCW7jbGPlnRBj 2B4g== X-Gm-Message-State: AOJu0YzVHyd14flKKR0zXomQhGKL+CoQ8jJ22nQy4bI8uKpm5M3bGcR7 VGHEyrGKAR1PuVDN3xwmb+8bmAde++fFjcxFubf/gNRrpvFqQduf+c+6EVsmr2WPadQk/MHJM0C YJaiMEirxDXssOm3tYedrsl3VG1HjYIltqpUqO4ewqc7KBpn0Iad2oxgdgyKD6/6cZOSTFaqUqn Wl4T9IR7idJXY+29SAJiWdXTFpymJwgKVbAz3VyXs= X-Received: by 2002:a05:6808:201b:b0:3c1:5557:453d with SMTP id q27-20020a056808201b00b003c15557453dmr6985740oiw.27.1708886410016; Sun, 25 Feb 2024 10:40:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUtV3lZRqyAwGKEu2Ty+ko3kidCoP+IVun6MIfI68dtLsyNmBiB/DGwgYQhskbKhAfUe96iw== X-Received: by 2002:a05:6808:201b:b0:3c1:5557:453d with SMTP id q27-20020a056808201b00b003c15557453dmr6985725oiw.27.1708886409527; Sun, 25 Feb 2024 10:40:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:08 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 01/10] conform: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:40 -0500 Message-ID: <20240225183956.2534939-1-carlos@redhat.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 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_H2, RCVD_IN_SORBS_WEB, 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 changes in generated binary artifacts. No regressions on x86_64 and i686. --- conform/Makefile | 344 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 278 insertions(+), 66 deletions(-) diff --git a/conform/Makefile b/conform/Makefile index b067cdf83b..73a3cb6da2 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -25,78 +25,290 @@ include ../Makeconfig conformtest-headers-data := $(wildcard data/*.h-data) \ $(wildcard data/*/*.h-data) -conformtest-standards := ISO ISO99 ISO11 POSIX XPG4 XPG42 UNIX98 XOPEN2K \ - POSIX2008 XOPEN2K8 - -conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \ - math.h setjmp.h signal.h stdarg.h stddef.h stdio.h \ - stdlib.h string.h time.h -conformtest-headers-ISO99 := $(conformtest-headers-ISO) complex.h fenv.h \ - inttypes.h iso646.h stdbool.h stdint.h tgmath.h \ - wchar.h wctype.h +conformtest-standards := \ + ISO \ + ISO11 \ + ISO99 \ + POSIX \ + POSIX2008 \ + UNIX98 \ + XOPEN2K \ + XOPEN2K8 \ + XPG4 \ + XPG42 \ + # conformtest-standards +conformtest-headers-ISO := \ + assert.h \ + ctype.h \ + errno.h \ + float.h \ + limits.h \ + locale.h \ + math.h \ + setjmp.h \ + signal.h \ + stdarg.h \ + stddef.h \ + stdio.h \ + stdlib.h \ + string.h \ + time.h \ + # conformtest-headers-ISO +conformtest-headers-ISO99 := \ + $(conformtest-headers-ISO) \ + complex.h \ + fenv.h \ + inttypes.h \ + iso646.h \ + stdbool.h \ + stdint.h \ + tgmath.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-ISO99 # Missing ISO11 expectations for: stdatomic.h -conformtest-headers-ISO11 := $(conformtest-headers-ISO99) stdalign.h \ - stdnoreturn.h threads.h uchar.h -conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \ - fcntl.h fnmatch.h glob.h grp.h mqueue.h \ - pthread.h pwd.h regex.h sched.h semaphore.h \ - sys/mman.h sys/stat.h sys/times.h sys/types.h \ - sys/utsname.h sys/wait.h tar.h termios.h \ - unistd.h utime.h wordexp.h +conformtest-headers-ISO11 := \ + $(conformtest-headers-ISO99) \ + stdalign.h \ + stdnoreturn.h \ + threads.h \ + uchar.h \ + # conformtest-headers-ISO11 +conformtest-headers-POSIX := \ + $(conformtest-headers-ISO) \ + aio.h \ + dirent.h \ + fcntl.h \ + fnmatch.h \ + glob.h \ + grp.h \ + mqueue.h \ + pthread.h \ + pwd.h \ + regex.h \ + sched.h \ + semaphore.h \ + sys/mman.h \ + sys/stat.h \ + sys/times.h \ + sys/types.h \ + sys/utsname.h \ + sys/wait.h \ + tar.h \ + termios.h \ + unistd.h \ + utime.h \ + wordexp.h \ + # conformtest-headers-POSIX # Missing XPG4 expectations for: regexp.h wchar.h. -conformtest-headers-XPG4 := $(conformtest-headers-ISO) cpio.h dirent.h \ - fcntl.h fnmatch.h ftw.h glob.h grp.h iconv.h \ - langinfo.h monetary.h nl_types.h pwd.h regex.h \ - search.h sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \ - sys/stat.h sys/times.h sys/types.h sys/utsname.h \ - sys/wait.h tar.h termios.h ulimit.h unistd.h \ - utime.h varargs.h wordexp.h -# Missing XPG42 expectations for: re_comp.h regexp.h wchar.h. +conformtest-headers-XPG4 := \ + $(conformtest-headers-ISO) \ + cpio.h \ + dirent.h \ + fcntl.h \ + fnmatch.h \ + ftw.h \ + glob.h \ + grp.h \ + iconv.h \ + langinfo.h \ + monetary.h \ + nl_types.h \ + pwd.h \ + regex.h \ + search.h \ + sys/ipc.h \ + sys/msg.h \ + sys/sem.h \ + sys/shm.h \ + sys/stat.h \ + sys/times.h \ + sys/types.h \ + sys/utsname.h \ + sys/wait.h \ + tar.h \ + termios.h \ + ulimit.h \ + unistd.h \ + utime.h \ + varargs.h \ + wordexp.h \ + # conformtest-headers-XPG4 +# Missing XPG42 expectations for: +# re_comp.h +# regexp.h +# wchar.h # XPG42 includes XTI and STREAMS, but those are not implemented by glibc. -conformtest-headers-XPG42 := $(conformtest-headers-XPG4) arpa/inet.h fmtmsg.h \ - libgen.h ndbm.h netdb.h netinet/in.h poll.h \ - strings.h sys/mman.h sys/resource.h \ - sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h \ - sys/uio.h sys/un.h syslog.h ucontext.h utmpx.h -# Missing UNIX98 expectations for: inttypes.h re_comp.h regexp.h. +conformtest-headers-XPG42 := \ + $(conformtest-headers-XPG4) \ + arpa/inet.h \ + fmtmsg.h \ + libgen.h \ + ndbm.h \ + netdb.h \ + netinet/in.h \ + poll.h \ + strings.h \ + sys/mman.h \ + sys/resource.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + ucontext.h \ + utmpx.h \ + # conformtest-headers-XPG42 +# Missing UNIX98 expectations for: +# inttypes.h +# re_comp.h +# regexp.h # The online UNIX98 includes XCURSES, but curses.h, term.h and # unctrl.h are outside the scope of these tests. It also includes # XTI and STREAMS, but those are not implemented by glibc. -conformtest-headers-UNIX98 := $(conformtest-headers-POSIX) arpa/inet.h cpio.h \ - dlfcn.h fmtmsg.h ftw.h iconv.h iso646.h \ - langinfo.h libgen.h monetary.h ndbm.h netdb.h \ - netinet/in.h nl_types.h poll.h search.h \ - strings.h sys/ipc.h sys/msg.h \ - sys/resource.h sys/sem.h sys/shm.h sys/socket.h \ - sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \ - sys/un.h syslog.h ucontext.h ulimit.h utmpx.h \ - varargs.h wchar.h wctype.h -# Missing XOPEN2K expectations for: trace.h, stropts.h. -conformtest-headers-XOPEN2K := $(conformtest-headers-POSIX) arpa/inet.h \ - complex.h cpio.h dlfcn.h fenv.h fmtmsg.h ftw.h \ - iconv.h inttypes.h iso646.h langinfo.h \ - libgen.h monetary.h ndbm.h net/if.h netdb.h \ - netinet/in.h netinet/tcp.h nl_types.h poll.h \ - search.h spawn.h stdbool.h stdint.h strings.h \ - sys/ipc.h sys/msg.h sys/resource.h \ - sys/select.h sys/sem.h sys/shm.h sys/socket.h \ - sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \ - sys/un.h syslog.h tgmath.h ucontext.h ulimit.h \ - utmpx.h wchar.h wctype.h -# Missing POSIX2008 expectations for: trace.h, stropts.h. -conformtest-headers-POSIX2008 := $(conformtest-headers-POSIX) arpa/inet.h \ - complex.h cpio.h dlfcn.h fenv.h iconv.h \ - inttypes.h iso646.h langinfo.h monetary.h \ - net/if.h netdb.h netinet/in.h netinet/tcp.h \ - nl_types.h poll.h spawn.h stdbool.h stdint.h \ - strings.h sys/select.h \ - sys/socket.h sys/statvfs.h sys/un.h tgmath.h \ - wchar.h wctype.h -# Missing XOPEN2K8 expectations for: trace.h. -conformtest-headers-XOPEN2K8 := $(conformtest-headers-POSIX2008) fmtmsg.h \ - ftw.h libgen.h ndbm.h search.h sys/ipc.h \ - sys/msg.h sys/resource.h sys/sem.h sys/shm.h \ - sys/time.h sys/uio.h syslog.h ulimit.h utmpx.h +conformtest-headers-UNIX98 := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + cpio.h \ + dlfcn.h \ + fmtmsg.h \ + ftw.h \ + iconv.h \ + iso646.h \ + langinfo.h \ + libgen.h \ + monetary.h \ + ndbm.h \ + netdb.h \ + netinet/in.h \ + nl_types.h \ + poll.h \ + search.h \ + strings.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + ucontext.h \ + ulimit.h \ + utmpx.h \ + varargs.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-UNIX98 +# Missing XOPEN2K expectations for: +# trace.h +# stropts.h +conformtest-headers-XOPEN2K := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + complex.h \ + cpio.h \ + dlfcn.h \ + fenv.h \ + fmtmsg.h \ + ftw.h \ + iconv.h \ + inttypes.h \ + iso646.h \ + langinfo.h \ + libgen.h \ + monetary.h \ + ndbm.h \ + net/if.h \ + netdb.h \ + netinet/in.h \ + netinet/tcp.h \ + nl_types.h \ + poll.h \ + search.h \ + spawn.h \ + stdbool.h \ + stdint.h \ + strings.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/select.h \ + sys/sem.h \ + sys/shm.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/time.h \ + sys/timeb.h \ + sys/uio.h \ + sys/un.h \ + syslog.h \ + tgmath.h \ + ucontext.h \ + ulimit.h \ + utmpx.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-XOPEN2K +# Missing POSIX2008 expectations for: +# trace.h +# stropts.h +conformtest-headers-POSIX2008 := \ + $(conformtest-headers-POSIX) \ + arpa/inet.h \ + complex.h \ + cpio.h \ + dlfcn.h \ + fenv.h \ + iconv.h \ + inttypes.h \ + iso646.h \ + langinfo.h \ + monetary.h \ + net/if.h \ + netdb.h \ + netinet/in.h \ + netinet/tcp.h \ + nl_types.h \ + poll.h \ + spawn.h \ + stdbool.h \ + stdint.h \ + strings.h \ + sys/select.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/un.h \ + tgmath.h \ + wchar.h \ + wctype.h \ + # conformtest-headers-POSIX2008 +# Missing XOPEN2K8 expectations for: +# trace.h +conformtest-headers-XOPEN2K8 := \ + $(conformtest-headers-POSIX2008) \ + fmtmsg.h \ + ftw.h \ + libgen.h \ + ndbm.h \ + search.h \ + sys/ipc.h \ + sys/msg.h \ + sys/resource.h \ + sys/sem.h \ + sys/shm.h \ + sys/time.h \ + sys/uio.h \ + syslog.h \ + ulimit.h \ + utmpx.h \ + # conformtest-headers-XOPEN2K8 conformtest-header-list-base := $(foreach std,$(conformtest-standards),\ header-list-$(std).out)