2019-02-15 20:51:58 +00:00
|
|
|
#!/usr/bin/python3
|
|
|
|
# Check that a wrapper header exist for each non-sysdeps header.
|
2021-01-02 19:32:25 +00:00
|
|
|
# Copyright (C) 2019-2021 Free Software Foundation, Inc.
|
2019-02-15 20:51:58 +00:00
|
|
|
# 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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
# <https://www.gnu.org/licenses/>.
|
2019-02-15 20:51:58 +00:00
|
|
|
|
|
|
|
# Non-sysdeps subdirectories are not on the C include path, so
|
|
|
|
# installed headers need to have a sysdep wrapper header.
|
|
|
|
#
|
|
|
|
# usage: scripts/checl-wrapper-headers.py \
|
|
|
|
# --root=$(..) --subdir=$(subdir) $(headers) \
|
|
|
|
# [--generated $(common-generated)]
|
|
|
|
#
|
|
|
|
# If invoked with --root=., the script is invoked from the root of the
|
|
|
|
# source tree, so paths starting with "include/" are skipped (because
|
|
|
|
# those do not require wrappers).
|
|
|
|
|
|
|
|
import argparse
|
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
|
|
|
|
# Some subdirectories are only compiled for essentially one target.
|
|
|
|
# In this case, we do not need to check for consistent wrapper
|
|
|
|
# headers. Hurd uses a custom way to Hurd-specific inject wrapper
|
|
|
|
# headers; see sysdeps/mach/Makefiles under "ifdef in-Makerules".
|
|
|
|
SINGLE_TARGET_SUBDIRS = frozenset(("hurd", "mach"))
|
|
|
|
|
|
|
|
# Name of the special subdirectory with the wrapper headers.
|
|
|
|
INCLUDE = "include"
|
|
|
|
|
|
|
|
def check_sysdeps_bits(args):
|
|
|
|
"""Check that the directory sysdeps/generic/bits does not exist."""
|
|
|
|
bits = os.path.join(args.root, 'sysdeps', 'generic', 'bits')
|
|
|
|
if os.path.exists(bits):
|
|
|
|
# See commit c72565e5f1124c2dc72573e83406fe999e56091f and
|
|
|
|
# <https://sourceware.org/ml/libc-alpha/2016-05/msg00189.html>.
|
|
|
|
print('error: directory {} has been added, use bits/ instead'.format(
|
|
|
|
os.path.relpath(os.path.realpath(bits), args.root)))
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
def check_headers_root(args):
|
|
|
|
"""Check headers located at the top level of the source tree."""
|
|
|
|
good = True
|
|
|
|
generated = frozenset(args.generated)
|
|
|
|
for header in args.headers:
|
|
|
|
if not (header.startswith('bits/')
|
|
|
|
or os.path.exists(os.path.join(args.root, INCLUDE, header))
|
|
|
|
or header in generated):
|
|
|
|
print('error: top-level header {} must be in bits/ or {}/'
|
|
|
|
.format(header, INCLUDE))
|
|
|
|
good = False
|
|
|
|
return good
|
|
|
|
|
|
|
|
def check_headers(args):
|
|
|
|
"""Check headers located in a subdirectory."""
|
|
|
|
good = True
|
|
|
|
for header in args.headers:
|
|
|
|
# Whitelist .x files, which never have include wrappers.
|
|
|
|
if header.endswith(".x"):
|
|
|
|
continue
|
|
|
|
|
|
|
|
is_nonsysdep_header = os.access(header, os.R_OK)
|
|
|
|
if is_nonsysdep_header:
|
2019-03-07 08:39:55 +00:00
|
|
|
# Skip Fortran header files.
|
2019-03-07 16:28:13 +00:00
|
|
|
if header.startswith("finclude/"):
|
2019-03-07 08:39:55 +00:00
|
|
|
continue
|
|
|
|
|
2019-02-15 20:51:58 +00:00
|
|
|
include_path = os.path.join(args.root, INCLUDE, header)
|
|
|
|
if not os.access(include_path, os.R_OK):
|
|
|
|
print('error: missing wrapper header {} for {}'.format(
|
|
|
|
os.path.join(INCLUDE, header),
|
|
|
|
os.path.relpath(os.path.realpath(header), args.root)))
|
|
|
|
good = False
|
|
|
|
return good
|
|
|
|
|
|
|
|
def main():
|
|
|
|
"""The main entry point."""
|
|
|
|
parser = argparse.ArgumentParser(
|
|
|
|
description='Check for missing wrapper headers in include/.')
|
|
|
|
parser.add_argument('--root', metavar='DIRECTORY', required=True,
|
|
|
|
help='Path to the top-level of the source tree')
|
|
|
|
parser.add_argument('--subdir', metavar='DIRECTORY', required=True,
|
|
|
|
help='Name of the subdirectory being processed')
|
|
|
|
parser.add_argument('--generated', metavar='FILE', default="", nargs="*",
|
|
|
|
help="Generated files (which are ignored)")
|
|
|
|
parser.add_argument('headers', help='Header files to process', nargs='+')
|
|
|
|
args = parser.parse_args()
|
|
|
|
|
|
|
|
good = (args.root == '.') == (args.subdir == '.')
|
|
|
|
if not good:
|
|
|
|
print('error: --root/--subdir disagree about top-of-tree location')
|
|
|
|
|
|
|
|
if args.subdir == '.':
|
|
|
|
good &= check_sysdeps_bits(args)
|
|
|
|
good &= check_headers_root(args)
|
|
|
|
elif args.subdir not in SINGLE_TARGET_SUBDIRS:
|
|
|
|
good &= check_headers(args)
|
|
|
|
|
|
|
|
if not good:
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
main()
|