From d879f0361fead32bef0a9dfa1900669bbd6ee930 Mon Sep 17 00:00:00 2001 From: faisal <71896424+faisalfakhro@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:07:20 +0300 Subject: [PATCH 01/21] add sha256 --- build/sage_bootstrap/package.py | 12 ++++++++++++ build/sage_bootstrap/tarball.py | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/build/sage_bootstrap/package.py b/build/sage_bootstrap/package.py index aea31e4b6a4..6f05911340a 100644 --- a/build/sage_bootstrap/package.py +++ b/build/sage_bootstrap/package.py @@ -91,6 +91,17 @@ def sha1(self): String. """ return self.__sha1 + + @property + def sha256(self): + """ + Return the SHA256 checksum + + OUTPUT: + + String. + """ + return self.__sha256 @property def cksum(self): @@ -478,6 +489,7 @@ def _init_checksum(self): pass self.__md5 = result.get('md5', None) self.__sha1 = result.get('sha1', None) + self.__sha256 = result.get('sha256', None) self.__cksum = result.get('cksum', None) self.__tarball_pattern = result.get('tarball', None) self.__tarball_upstream_url_pattern = result.get('upstream_url', None) diff --git a/build/sage_bootstrap/tarball.py b/build/sage_bootstrap/tarball.py index 441d97cb3c6..ed3bf50796f 100644 --- a/build/sage_bootstrap/tarball.py +++ b/build/sage_bootstrap/tarball.py @@ -116,6 +116,10 @@ def _compute_hash(self, algorithm): def _compute_sha1(self): import hashlib return self._compute_hash(hashlib.sha1()) + + def _compute_sha256(self): + import hashlib + return self._compute_hash(hashlib.sha256()) def _compute_md5(self): import hashlib From b45ada686e51a75b6d72184ab4b3af55af733f4d Mon Sep 17 00:00:00 2001 From: faisal <71896424+faisalfakhro@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:06:53 +0300 Subject: [PATCH 02/21] sha256/sha1 checksum priority --- build/sage_bootstrap/tarball.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/sage_bootstrap/tarball.py b/build/sage_bootstrap/tarball.py index ed3bf50796f..919c83039b7 100644 --- a/build/sage_bootstrap/tarball.py +++ b/build/sage_bootstrap/tarball.py @@ -133,8 +133,13 @@ def checksum_verifies(self): """ Test whether the checksum of the downloaded file is correct. """ - sha1 = self._compute_sha1() - return sha1 == self.package.sha1 + if self.package.sha256: + sha256 = self._compute_sha256() + return sha256 == self.package.sha256 + else: + log.warning('sha1 used for {pn} checksum'.format(pn=self.package.package_name)) + sha1 = self._compute_sha1() + return sha1 == self.package.sha1 def is_distributable(self): return 'do-not-distribute' not in self.filename From bde1df42484b1d6b81f0ece9b40bc68a3c47e52b Mon Sep 17 00:00:00 2001 From: faisal <71896424+faisalfakhro@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:15:44 +0300 Subject: [PATCH 03/21] update checksums.ini files with sha256 --- build/pkgs/4ti2/checksums.ini | 1 + build/pkgs/alabaster/checksums.ini | 1 + build/pkgs/anyio/checksums.ini | 1 + build/pkgs/appdirs/checksums.ini | 1 + build/pkgs/appnope/checksums.ini | 1 + build/pkgs/argon2_cffi/checksums.ini | 1 + build/pkgs/argon2_cffi_bindings/checksums.ini | 1 + build/pkgs/arrow/checksums.ini | 1 + build/pkgs/asttokens/checksums.ini | 1 + build/pkgs/async_lru/checksums.ini | 1 + build/pkgs/attrs/checksums.ini | 1 + build/pkgs/awali/checksums.ini | 1 + build/pkgs/babel/checksums.ini | 1 + build/pkgs/barvinok/checksums.ini | 1 + build/pkgs/beautifulsoup4/checksums.ini | 1 + build/pkgs/beniget/checksums.ini | 1 + build/pkgs/benzene/checksums.ini | 1 + build/pkgs/bleach/checksums.ini | 1 + build/pkgs/bliss/checksums.ini | 1 + build/pkgs/boost_cropped/checksums.ini | 1 + build/pkgs/brial/checksums.ini | 1 + build/pkgs/buckygen/checksums.ini | 1 + build/pkgs/bzip2/checksums.ini | 1 + build/pkgs/cachetools/checksums.ini | 1 + build/pkgs/calver/checksums.ini | 1 + build/pkgs/cbc/checksums.ini | 1 + build/pkgs/ccache/checksums.ini | 1 + build/pkgs/cddlib/checksums.ini | 1 + build/pkgs/certifi/checksums.ini | 1 + build/pkgs/cffi/checksums.ini | 1 + build/pkgs/chardet/checksums.ini | 1 + build/pkgs/charset_normalizer/checksums.ini | 1 + build/pkgs/cliquer/checksums.ini | 1 + build/pkgs/cmake/checksums.ini | 1 + build/pkgs/cocoalib/checksums.ini | 1 + build/pkgs/colorama/checksums.ini | 1 + build/pkgs/combinatorial_designs/checksums.ini | 1 + build/pkgs/comm/checksums.ini | 1 + build/pkgs/contourpy/checksums.ini | 1 + build/pkgs/conway_polynomials/checksums.ini | 1 + build/pkgs/coxeter3/checksums.ini | 1 + build/pkgs/cppy/checksums.ini | 1 + build/pkgs/cryptominisat/checksums.ini | 1 + build/pkgs/csdp/checksums.ini | 1 + build/pkgs/cunningham_tables/checksums.ini | 1 + build/pkgs/curl/checksums.ini | 1 + build/pkgs/cvxopt/checksums.ini | 1 + build/pkgs/cvxpy/checksums.ini | 1 + build/pkgs/cycler/checksums.ini | 1 + build/pkgs/cylp/checksums.ini | 1 + build/pkgs/cysignals/checksums.ini | 1 + build/pkgs/cython/checksums.ini | 1 + build/pkgs/d3js/checksums.ini | 1 + build/pkgs/database_cremona_ellcurve/checksums.ini | 1 + build/pkgs/database_cubic_hecke/checksums.ini | 1 + build/pkgs/database_jones_numfield/checksums.ini | 1 + build/pkgs/database_knotinfo/checksums.ini | 1 + build/pkgs/database_kohel/checksums.ini | 1 + build/pkgs/database_mutation_class/checksums.ini | 1 + build/pkgs/database_odlyzko_zeta/checksums.ini | 1 + build/pkgs/database_stein_watkins/checksums.ini | 1 + build/pkgs/database_stein_watkins_mini/checksums.ini | 1 + build/pkgs/database_symbolic_data/checksums.ini | 1 + build/pkgs/dateutil/checksums.ini | 1 + build/pkgs/debugpy/checksums.ini | 1 + build/pkgs/decorator/checksums.ini | 1 + build/pkgs/deformation/checksums.ini | 1 + build/pkgs/defusedxml/checksums.ini | 1 + build/pkgs/distlib/checksums.ini | 1 + build/pkgs/docutils/checksums.ini | 1 + build/pkgs/dot2tex/checksums.ini | 1 + build/pkgs/dsdp/checksums.ini | 1 + build/pkgs/e_antic/checksums.ini | 1 + build/pkgs/ecl/checksums.ini | 1 + build/pkgs/eclib/checksums.ini | 1 + build/pkgs/ecm/checksums.ini | 1 + build/pkgs/ecos_python/checksums.ini | 1 + build/pkgs/editables/checksums.ini | 1 + build/pkgs/elliptic_curves/checksums.ini | 1 + build/pkgs/entrypoints/checksums.ini | 1 + build/pkgs/exceptiongroup/checksums.ini | 1 + build/pkgs/executing/checksums.ini | 1 + build/pkgs/fastjsonschema/checksums.ini | 1 + build/pkgs/fflas_ffpack/checksums.ini | 1 + build/pkgs/filelock/checksums.ini | 1 + build/pkgs/flint/checksums.ini | 1 + build/pkgs/flit_core/checksums.ini | 1 + build/pkgs/fonttools/checksums.ini | 1 + build/pkgs/fplll/checksums.ini | 1 + build/pkgs/fpylll/checksums.ini | 1 + build/pkgs/fqdn/checksums.ini | 1 + build/pkgs/freetype/checksums.ini | 1 + build/pkgs/fricas/checksums.ini | 1 + build/pkgs/frobby/checksums.ini | 1 + build/pkgs/furo/checksums.ini | 1 + build/pkgs/gambit/checksums.ini | 1 + build/pkgs/gap/checksums.ini | 1 + build/pkgs/gap3/checksums.ini | 1 + build/pkgs/gap_jupyter/checksums.ini | 1 + build/pkgs/gast/checksums.ini | 1 + build/pkgs/gc/checksums.ini | 1 + build/pkgs/gcc/checksums.ini | 1 + build/pkgs/gdb/checksums.ini | 1 + build/pkgs/gengetopt/checksums.ini | 1 + build/pkgs/gf2x/checksums.ini | 1 + build/pkgs/gfan/checksums.ini | 1 + build/pkgs/giac/checksums.ini | 1 + build/pkgs/givaro/checksums.ini | 1 + build/pkgs/glpk/checksums.ini | 1 + build/pkgs/glucose/checksums.ini | 1 + build/pkgs/gmp/checksums.ini | 1 + build/pkgs/gmpy2/checksums.ini | 1 + build/pkgs/gnumake_tokenpool/checksums.ini | 1 + build/pkgs/gp2c/checksums.ini | 1 + build/pkgs/graphs/checksums.ini | 1 + build/pkgs/gsl/checksums.ini | 1 + build/pkgs/h11/checksums.ini | 1 + build/pkgs/hatch_fancy_pypi_readme/checksums.ini | 1 + build/pkgs/hatch_vcs/checksums.ini | 1 + build/pkgs/hatchling/checksums.ini | 1 + build/pkgs/httpcore/checksums.ini | 1 + build/pkgs/httpx/checksums.ini | 1 + build/pkgs/idna/checksums.ini | 1 + build/pkgs/igraph/checksums.ini | 1 + build/pkgs/imagesize/checksums.ini | 1 + build/pkgs/iml/checksums.ini | 1 + build/pkgs/importlib_metadata/checksums.ini | 1 + build/pkgs/importlib_resources/checksums.ini | 1 + build/pkgs/info/checksums.ini | 1 + build/pkgs/ipykernel/checksums.ini | 1 + build/pkgs/ipympl/checksums.ini | 1 + build/pkgs/ipython/checksums.ini | 1 + build/pkgs/ipython_genutils/checksums.ini | 1 + build/pkgs/ipywidgets/checksums.ini | 1 + build/pkgs/isl/checksums.ini | 1 + build/pkgs/isoduration/checksums.ini | 1 + build/pkgs/jedi/checksums.ini | 1 + build/pkgs/jinja2/checksums.ini | 1 + build/pkgs/jmol/checksums.ini | 1 + build/pkgs/json5/checksums.ini | 1 + build/pkgs/jsonpointer/checksums.ini | 1 + build/pkgs/jsonschema/checksums.ini | 1 + build/pkgs/jsonschema_specifications/checksums.ini | 1 + build/pkgs/jupymake/checksums.ini | 1 + build/pkgs/jupyter_client/checksums.ini | 1 + build/pkgs/jupyter_core/checksums.ini | 1 + build/pkgs/jupyter_events/checksums.ini | 1 + build/pkgs/jupyter_jsmol/checksums.ini | 1 + build/pkgs/jupyter_lsp/checksums.ini | 1 + build/pkgs/jupyter_server/checksums.ini | 1 + build/pkgs/jupyter_server_terminals/checksums.ini | 1 + build/pkgs/jupyterlab/checksums.ini | 1 + build/pkgs/jupyterlab_mathjax2/checksums.ini | 1 + build/pkgs/jupyterlab_pygments/checksums.ini | 1 + build/pkgs/jupyterlab_server/checksums.ini | 1 + build/pkgs/jupyterlab_widgets/checksums.ini | 1 + build/pkgs/kenzo/checksums.ini | 3 ++- build/pkgs/kissat/checksums.ini | 1 + build/pkgs/kiwisolver/checksums.ini | 1 + build/pkgs/latte_int/checksums.ini | 1 + build/pkgs/lcalc/checksums.ini | 1 + build/pkgs/libatomic_ops/checksums.ini | 1 + build/pkgs/libbraiding/checksums.ini | 1 + build/pkgs/libffi/checksums.ini | 1 + build/pkgs/libgd/checksums.ini | 1 + build/pkgs/libhomfly/checksums.ini | 1 + build/pkgs/libogg/checksums.ini | 1 + build/pkgs/libpng/checksums.ini | 1 + build/pkgs/libsemigroups/checksums.ini | 1 + build/pkgs/libtheora/checksums.ini | 1 + build/pkgs/lidia/checksums.ini | 1 + build/pkgs/lie/checksums.ini | 1 + build/pkgs/linbox/checksums.ini | 1 + build/pkgs/lrcalc/checksums.ini | 1 + build/pkgs/lrcalc_python/checksums.ini | 1 + build/pkgs/lrslib/checksums.ini | 1 + build/pkgs/m4ri/checksums.ini | 1 + build/pkgs/m4rie/checksums.ini | 1 + build/pkgs/markupsafe/checksums.ini | 1 + build/pkgs/mathics/checksums.ini | 1 + build/pkgs/mathics_scanner/checksums.ini | 1 + build/pkgs/mathjax/checksums.ini | 1 + build/pkgs/matplotlib/checksums.ini | 1 + build/pkgs/matplotlib_inline/checksums.ini | 1 + build/pkgs/matroid_database/checksums.ini | 1 + build/pkgs/maxima/checksums.ini | 1 + build/pkgs/mcqd/checksums.ini | 1 + build/pkgs/meataxe/checksums.ini | 1 + build/pkgs/meson/checksums.ini | 1 + build/pkgs/meson_python/checksums.ini | 1 + build/pkgs/mistune/checksums.ini | 1 + build/pkgs/modular_decomposition/checksums.ini | 1 + build/pkgs/modular_resolution/checksums.ini | 1 + build/pkgs/mpc/checksums.ini | 1 + build/pkgs/mpfi/checksums.ini | 1 + build/pkgs/mpfr/checksums.ini | 1 + build/pkgs/mpfrcx/checksums.ini | 1 + build/pkgs/mpmath/checksums.ini | 1 + build/pkgs/nauty/checksums.ini | 1 + build/pkgs/nbclient/checksums.ini | 1 + build/pkgs/nbconvert/checksums.ini | 1 + build/pkgs/nbformat/checksums.ini | 1 + build/pkgs/ncurses/checksums.ini | 1 + build/pkgs/nest_asyncio/checksums.ini | 1 + build/pkgs/networkx/checksums.ini | 1 + build/pkgs/ninja_build/checksums.ini | 1 + build/pkgs/normaliz/checksums.ini | 1 + build/pkgs/notebook/checksums.ini | 1 + build/pkgs/notebook_shim/checksums.ini | 1 + build/pkgs/notedown/checksums.ini | 1 + build/pkgs/ntl/checksums.ini | 1 + build/pkgs/numpy/checksums.ini | 1 + build/pkgs/openblas/checksums.ini | 1 + build/pkgs/openssl/checksums.ini | 1 + build/pkgs/osqp_python/checksums.ini | 1 + build/pkgs/overrides/checksums.ini | 1 + build/pkgs/p_group_cohomology/checksums.ini | 1 + build/pkgs/packaging/checksums.ini | 1 + build/pkgs/palettable/checksums.ini | 1 + build/pkgs/palp/checksums.ini | 1 + build/pkgs/pandoc_attributes/checksums.ini | 1 + build/pkgs/pandocfilters/checksums.ini | 1 + build/pkgs/pari/checksums.ini | 1 + build/pkgs/pari_elldata/checksums.ini | 1 + build/pkgs/pari_galdata/checksums.ini | 1 + build/pkgs/pari_galpol/checksums.ini | 1 + build/pkgs/pari_jupyter/checksums.ini | 1 + build/pkgs/pari_nftables/checksums.ini | 1 + build/pkgs/pari_seadata/checksums.ini | 1 + build/pkgs/pari_seadata_small/checksums.ini | 1 + build/pkgs/parso/checksums.ini | 1 + build/pkgs/patch/checksums.ini | 1 + build/pkgs/patchelf/checksums.ini | 1 + build/pkgs/pathspec/checksums.ini | 1 + build/pkgs/perl_term_readline_gnu/checksums.ini | 1 + build/pkgs/pexpect/checksums.ini | 1 + build/pkgs/pickleshare/checksums.ini | 1 + build/pkgs/pillow/checksums.ini | 1 + build/pkgs/pint/checksums.ini | 1 + build/pkgs/pip/checksums.ini | 1 + build/pkgs/pkgconf/checksums.ini | 1 + build/pkgs/pkgconfig/checksums.ini | 1 + build/pkgs/planarity/checksums.ini | 1 + build/pkgs/plantri/checksums.ini | 1 + build/pkgs/platformdirs/checksums.ini | 1 + build/pkgs/pluggy/checksums.ini | 1 + build/pkgs/ply/checksums.ini | 1 + build/pkgs/polylib/checksums.ini | 1 + build/pkgs/polymake/checksums.ini | 1 + build/pkgs/polytopes_db/checksums.ini | 1 + build/pkgs/polytopes_db_4d/checksums.ini | 1 + build/pkgs/ppl/checksums.ini | 1 + build/pkgs/pplpy/checksums.ini | 1 + build/pkgs/primecount/checksums.ini | 1 + build/pkgs/primecountpy/checksums.ini | 1 + build/pkgs/primesieve/checksums.ini | 1 + build/pkgs/prometheus_client/checksums.ini | 1 + build/pkgs/prompt_toolkit/checksums.ini | 1 + build/pkgs/psutil/checksums.ini | 1 + build/pkgs/ptyprocess/checksums.ini | 1 + build/pkgs/pure_eval/checksums.ini | 1 + build/pkgs/py/checksums.ini | 1 + build/pkgs/pybind11/checksums.ini | 1 + build/pkgs/pycosat/checksums.ini | 1 + build/pkgs/pycparser/checksums.ini | 1 + build/pkgs/pygments/checksums.ini | 1 + build/pkgs/pynormaliz/checksums.ini | 1 + build/pkgs/pyparsing/checksums.ini | 1 + build/pkgs/pyproject_api/checksums.ini | 1 + build/pkgs/pyproject_metadata/checksums.ini | 1 + build/pkgs/pyrsistent/checksums.ini | 1 + build/pkgs/pysingular/checksums.ini | 1 + build/pkgs/python3/checksums.ini | 1 + build/pkgs/python_igraph/checksums.ini | 1 + build/pkgs/python_json_logger/checksums.ini | 1 + build/pkgs/pytz/checksums.ini | 1 + build/pkgs/pytz_deprecation_shim/checksums.ini | 1 + build/pkgs/pyyaml/checksums.ini | 1 + build/pkgs/pyzmq/checksums.ini | 1 + build/pkgs/qdldl_python/checksums.ini | 1 + build/pkgs/qepcad/checksums.ini | 1 + build/pkgs/qhull/checksums.ini | 1 + build/pkgs/readline/checksums.ini | 1 + build/pkgs/referencing/checksums.ini | 1 + build/pkgs/requests/checksums.ini | 1 + build/pkgs/rfc3339_validator/checksums.ini | 1 + build/pkgs/rfc3986_validator/checksums.ini | 1 + build/pkgs/rpy2/checksums.ini | 1 + build/pkgs/rst2ipynb/checksums.ini | 1 + build/pkgs/rubiks/checksums.ini | 1 + build/pkgs/rw/checksums.ini | 1 + build/pkgs/saclib/checksums.ini | 1 + build/pkgs/sage_numerical_backends_coin/checksums.ini | 1 + build/pkgs/sage_numerical_backends_cplex/checksums.ini | 1 + build/pkgs/sage_numerical_backends_gurobi/checksums.ini | 1 + build/pkgs/sagenb_export/checksums.ini | 1 + build/pkgs/sagetex/checksums.ini | 1 + build/pkgs/scs/checksums.ini | 1 + build/pkgs/send2trash/checksums.ini | 1 + build/pkgs/setuptools/checksums.ini | 1 + build/pkgs/setuptools_scm/checksums.ini | 1 + build/pkgs/singular/checksums.ini | 1 + build/pkgs/singular_jupyter/checksums.ini | 1 + build/pkgs/sirocco/checksums.ini | 1 + build/pkgs/six/checksums.ini | 1 + build/pkgs/sniffio/checksums.ini | 1 + build/pkgs/snowballstemmer/checksums.ini | 1 + build/pkgs/soupsieve/checksums.ini | 1 + build/pkgs/sphinx/checksums.ini | 1 + build/pkgs/sphinx_basic_ng/checksums.ini | 1 + build/pkgs/sphinx_copybutton/checksums.ini | 1 + build/pkgs/sphinx_inline_tabs/checksums.ini | 1 + build/pkgs/sphinxcontrib_applehelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_devhelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_htmlhelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_jsmath/checksums.ini | 1 + build/pkgs/sphinxcontrib_qthelp/checksums.ini | 1 + build/pkgs/sphinxcontrib_serializinghtml/checksums.ini | 1 + build/pkgs/sphinxcontrib_websupport/checksums.ini | 1 + build/pkgs/sqlite/checksums.ini | 1 + build/pkgs/stack_data/checksums.ini | 1 + build/pkgs/suitesparse/checksums.ini | 1 + build/pkgs/surf/checksums.ini | 1 + build/pkgs/symengine/checksums.ini | 2 +- build/pkgs/symmetrica/checksums.ini | 1 + build/pkgs/sympow/checksums.ini | 1 + build/pkgs/sympy/checksums.ini | 1 + build/pkgs/tachyon/checksums.ini | 1 + build/pkgs/tdlib/checksums.ini | 1 + build/pkgs/terminado/checksums.ini | 1 + build/pkgs/texttable/checksums.ini | 1 + build/pkgs/threejs/checksums.ini | 1 + build/pkgs/tides/checksums.ini | 1 + build/pkgs/tinycss2/checksums.ini | 1 + build/pkgs/tomli/checksums.ini | 1 + build/pkgs/topcom/checksums.ini | 1 + build/pkgs/tornado/checksums.ini | 1 + build/pkgs/tox/checksums.ini | 1 + build/pkgs/traitlets/checksums.ini | 1 + build/pkgs/trove_classifiers/checksums.ini | 1 + build/pkgs/types_python_dateutil/checksums.ini | 1 + build/pkgs/typing_extensions/checksums.ini | 1 + build/pkgs/tzdata/checksums.ini | 1 + build/pkgs/tzlocal/checksums.ini | 1 + build/pkgs/uri_template/checksums.ini | 1 + build/pkgs/urllib3/checksums.ini | 1 + build/pkgs/valgrind/checksums.ini | 1 + build/pkgs/virtualenv/checksums.ini | 1 + build/pkgs/wcwidth/checksums.ini | 1 + build/pkgs/webcolors/checksums.ini | 1 + build/pkgs/webencodings/checksums.ini | 1 + build/pkgs/websocket_client/checksums.ini | 1 + build/pkgs/wheel/checksums.ini | 1 + build/pkgs/widgetsnbextension/checksums.ini | 1 + build/pkgs/xz/checksums.ini | 1 + build/pkgs/zeromq/checksums.ini | 1 + build/pkgs/zipp/checksums.ini | 1 + build/pkgs/zlib/checksums.ini | 1 + build/sage_bootstrap/updater.py | 1 + 359 files changed, 360 insertions(+), 2 deletions(-) diff --git a/build/pkgs/4ti2/checksums.ini b/build/pkgs/4ti2/checksums.ini index 047f39ece1d..5e3be152e91 100644 --- a/build/pkgs/4ti2/checksums.ini +++ b/build/pkgs/4ti2/checksums.ini @@ -1,5 +1,6 @@ tarball=4ti2-${VERSION}.tar.gz sha1=3d41f30ea3ef94c293eae30c087494269fc1a6b9 +sha256=f7c191beb14246b643e4fd5b18b53d9966693b9e6d3a569441a0e3ca14b1a86b md5=1215872325ddfc561865ecb22b2bccb2 cksum=2439180289 upstream_url=https://github.com/4ti2/4ti2/releases/download/Release_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}/4ti2-${VERSION}.tar.gz diff --git a/build/pkgs/alabaster/checksums.ini b/build/pkgs/alabaster/checksums.ini index 8e79c9a28b3..e1dd770acf5 100644 --- a/build/pkgs/alabaster/checksums.ini +++ b/build/pkgs/alabaster/checksums.ini @@ -1,5 +1,6 @@ tarball=alabaster-VERSION-py3-none-any.whl sha1=6c86446396c69236a1542e09771e8d7b8487dcfa +sha256=b46733c07dce03ae4e150330b975c75737fa60f0a7c591b6c8bf4928a28e2c92 md5=a1c5ddb246633ac0567beef4a1dcffd7 cksum=2188566230 upstream_url=https://pypi.io/packages/py3/a/alabaster/alabaster-VERSION-py3-none-any.whl diff --git a/build/pkgs/anyio/checksums.ini b/build/pkgs/anyio/checksums.ini index 4dcafcb69da..95704a75b81 100644 --- a/build/pkgs/anyio/checksums.ini +++ b/build/pkgs/anyio/checksums.ini @@ -1,5 +1,6 @@ tarball=anyio-VERSION-py3-none-any.whl sha1=bb08368bb19e1aff2f4190e39300e43fee52103e +sha256=cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f md5=420d85e19168705cdf0223621b18831a cksum=627181302 upstream_url=https://pypi.io/packages/py3/a/anyio/anyio-VERSION-py3-none-any.whl diff --git a/build/pkgs/appdirs/checksums.ini b/build/pkgs/appdirs/checksums.ini index 3e83a68f3a0..4199d3d7291 100644 --- a/build/pkgs/appdirs/checksums.ini +++ b/build/pkgs/appdirs/checksums.ini @@ -1,5 +1,6 @@ tarball=appdirs-VERSION-py2.py3-none-any.whl sha1=fc74022712122436427f8282a47bfa430ec2db56 +sha256=a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 md5=1d638a5913a8d8ed8e7c7d789ece149c cksum=3594208532 upstream_url=https://pypi.io/packages/py2.py3/a/appdirs/appdirs-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/appnope/checksums.ini b/build/pkgs/appnope/checksums.ini index f29070a251b..1a62a3a7a31 100644 --- a/build/pkgs/appnope/checksums.ini +++ b/build/pkgs/appnope/checksums.ini @@ -1,5 +1,6 @@ tarball=appnope-VERSION.tar.gz sha1=dd705054af5f6c80d0ce9e1b444428c7b1b07daa +sha256=02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24 md5=ca8ec0b1628061ce922dbf1ceee25bca cksum=3863274580 upstream_url=https://pypi.io/packages/source/a/appnope/appnope-VERSION.tar.gz diff --git a/build/pkgs/argon2_cffi/checksums.ini b/build/pkgs/argon2_cffi/checksums.ini index fa87877c2e6..60f1ce9fa07 100644 --- a/build/pkgs/argon2_cffi/checksums.ini +++ b/build/pkgs/argon2_cffi/checksums.ini @@ -1,5 +1,6 @@ tarball=argon2-cffi-VERSION.tar.gz sha1=c16c1506de0211bdfa23d4d51e780fb4aaff5222 +sha256=d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b md5=b7843e8690c790f8e743d37bb75c25a8 cksum=3700408796 upstream_url=https://pypi.io/packages/source/a/argon2_cffi/argon2-cffi-VERSION.tar.gz diff --git a/build/pkgs/argon2_cffi_bindings/checksums.ini b/build/pkgs/argon2_cffi_bindings/checksums.ini index fe2e878a74d..9cdfb9a28f8 100644 --- a/build/pkgs/argon2_cffi_bindings/checksums.ini +++ b/build/pkgs/argon2_cffi_bindings/checksums.ini @@ -1,5 +1,6 @@ tarball=argon2-cffi-bindings-VERSION.tar.gz sha1=5a9b8906d9ca73c53c2bf0a2f0a8127fda69e965 +sha256=bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 md5=f1591e1af7dea9ef3e5b982e2c196c1d cksum=2420586823 upstream_url=https://pypi.io/packages/source/a/argon2_cffi_bindings/argon2-cffi-bindings-VERSION.tar.gz diff --git a/build/pkgs/arrow/checksums.ini b/build/pkgs/arrow/checksums.ini index 8823edda27e..75fb726029a 100644 --- a/build/pkgs/arrow/checksums.ini +++ b/build/pkgs/arrow/checksums.ini @@ -1,5 +1,6 @@ tarball=arrow-VERSION-py3-none-any.whl sha1=fd9376ef4788dc2b1c981e6b5beb9048e046c556 +sha256=c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80 md5=71d18bb3d882ae242b5b1a397313bb12 cksum=244356435 upstream_url=https://pypi.io/packages/py3/a/arrow/arrow-VERSION-py3-none-any.whl diff --git a/build/pkgs/asttokens/checksums.ini b/build/pkgs/asttokens/checksums.ini index 44d0ca1b500..74dee3a1017 100644 --- a/build/pkgs/asttokens/checksums.ini +++ b/build/pkgs/asttokens/checksums.ini @@ -1,5 +1,6 @@ tarball=asttokens-VERSION.tar.gz sha1=d522a139240293953c99d32ca62c41542babb963 +sha256=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0 md5=c353679585a40f43c24ca60fca33bbf6 cksum=1117135252 upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz diff --git a/build/pkgs/async_lru/checksums.ini b/build/pkgs/async_lru/checksums.ini index 1a289cb63c3..b70f2c6bce2 100644 --- a/build/pkgs/async_lru/checksums.ini +++ b/build/pkgs/async_lru/checksums.ini @@ -1,5 +1,6 @@ tarball=async_lru-VERSION-py3-none-any.whl sha1=99b2ea5d551cbad28e08e45f0d0b00827f9ff73d +sha256=ff02944ce3c288c5be660c42dbcca0742b32c3b279d6dceda655190240b99224 md5=de1e9e7559810690de8b7084b372d9a2 cksum=3326301475 upstream_url=https://pypi.io/packages/py3/a/async_lru/async_lru-VERSION-py3-none-any.whl diff --git a/build/pkgs/attrs/checksums.ini b/build/pkgs/attrs/checksums.ini index 74904048262..dcfa1c31428 100644 --- a/build/pkgs/attrs/checksums.ini +++ b/build/pkgs/attrs/checksums.ini @@ -1,5 +1,6 @@ tarball=attrs-VERSION-py3-none-any.whl sha1=d916b1ecad441ce7f07d86034085475f6c231830 +sha256=1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 md5=5aecf1f8857233a04c1926ea68e8f860 cksum=1934687514 upstream_url=https://pypi.io/packages/py3/a/attrs/attrs-VERSION-py3-none-any.whl diff --git a/build/pkgs/awali/checksums.ini b/build/pkgs/awali/checksums.ini index 60138d29e19..d9678c3b4a8 100644 --- a/build/pkgs/awali/checksums.ini +++ b/build/pkgs/awali/checksums.ini @@ -1,4 +1,5 @@ tarball=awali-all-vVERSION.tgz sha1=9098aaefde031df58374bab0c1fc38109eecd4e3 +sha256=85a2de222f93554d2959e16f64d8e7549b25446dcb0564ed1cb57196fc35f108 md5=d4216d8cbe21f83ae3a816a2f994f85e cksum=3149228485 diff --git a/build/pkgs/babel/checksums.ini b/build/pkgs/babel/checksums.ini index e97dabc2292..1ddb70619dd 100644 --- a/build/pkgs/babel/checksums.ini +++ b/build/pkgs/babel/checksums.ini @@ -1,5 +1,6 @@ tarball=Babel-VERSION-py3-none-any.whl sha1=7f8671a725d0bbf28618841c441af8bd7709d527 +sha256=efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287 md5=36702a42728c34366bf2ba612b9077cc cksum=2476971038 upstream_url=https://pypi.io/packages/py3/b/babel/Babel-VERSION-py3-none-any.whl diff --git a/build/pkgs/barvinok/checksums.ini b/build/pkgs/barvinok/checksums.ini index fce4148ce81..38e0255e609 100644 --- a/build/pkgs/barvinok/checksums.ini +++ b/build/pkgs/barvinok/checksums.ini @@ -1,5 +1,6 @@ tarball=barvinok-VERSION.tar.xz sha1=1e17e72732f7e96017d9ae0c3394c3c77c185f2e +sha256=049a2e0ac061668c2cb6d9832e42c3800c09b5095aef57abd8421ea727df58a3 md5=57066c5aa5628b89345c16ed95f93d7e cksum=2863920036 upstream_url=https://sourceforge.net/projects/barvinok/files/barvinok-VERSION.tar.xz diff --git a/build/pkgs/beautifulsoup4/checksums.ini b/build/pkgs/beautifulsoup4/checksums.ini index 0fd063dd71c..431a522c408 100644 --- a/build/pkgs/beautifulsoup4/checksums.ini +++ b/build/pkgs/beautifulsoup4/checksums.ini @@ -1,5 +1,6 @@ tarball=beautifulsoup4-VERSION.tar.gz sha1=d9cd72f81e7710692b8ff0a42e69bf93375b5fd3 +sha256=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da md5=b49a6696a762e946c2be97c36a5adaa8 cksum=839566236 upstream_url=https://pypi.io/packages/source/b/beautifulsoup4/beautifulsoup4-VERSION.tar.gz diff --git a/build/pkgs/beniget/checksums.ini b/build/pkgs/beniget/checksums.ini index 731aafbe3f0..ecb028be62c 100644 --- a/build/pkgs/beniget/checksums.ini +++ b/build/pkgs/beniget/checksums.ini @@ -1,5 +1,6 @@ tarball=beniget-VERSION.tar.gz sha1=0167f16d17fbd61b91e620bca07e4ec7054ce51d +sha256=75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c md5=a2bbe7f17f10f9c127d8ef00692ddc55 cksum=2287567629 upstream_url=https://pypi.io/packages/source/b/beniget/beniget-VERSION.tar.gz diff --git a/build/pkgs/benzene/checksums.ini b/build/pkgs/benzene/checksums.ini index 1df7cd9dcf0..a4b4666715d 100644 --- a/build/pkgs/benzene/checksums.ini +++ b/build/pkgs/benzene/checksums.ini @@ -1,4 +1,5 @@ tarball=benzene-VERSION.tar.bz2 sha1=7618f1e21e91459a8b050b948698a75b042d6d80 +sha256=63e8662672a007f5b2a727df0ab0e38825c65229fd1060fbf5b5d87b3301e9c6 md5=ac592d6af7495b51b382b8828ee84323 cksum=1973449623 diff --git a/build/pkgs/bleach/checksums.ini b/build/pkgs/bleach/checksums.ini index 33843727cd9..c5284c308f3 100644 --- a/build/pkgs/bleach/checksums.ini +++ b/build/pkgs/bleach/checksums.ini @@ -1,5 +1,6 @@ tarball=bleach-VERSION-py3-none-any.whl sha1=7ba81a446171fb840d3083afadd0c87f0b599305 +sha256=3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6 md5=ec9e860103ffbc3e6e9963485464bfbc cksum=1174632300 upstream_url=https://pypi.io/packages/py3/b/bleach/bleach-VERSION-py3-none-any.whl diff --git a/build/pkgs/bliss/checksums.ini b/build/pkgs/bliss/checksums.ini index 0c1ebf647bc..43a28b1e2b9 100644 --- a/build/pkgs/bliss/checksums.ini +++ b/build/pkgs/bliss/checksums.ini @@ -1,5 +1,6 @@ tarball=bliss-VERSION.zip sha1=c91c9dcbc11d66ffbcf6415e09ebe793df37be2a +sha256=acc8b98034f30fad24c897f365abd866c13d9f1bb207e398d0caf136875972a4 md5=5707cbfd9fd00980571c64ab3584c505 cksum=1626493724 upstream_url=https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-VERSION.zip diff --git a/build/pkgs/boost_cropped/checksums.ini b/build/pkgs/boost_cropped/checksums.ini index 245f90d6c85..de64a05a26c 100644 --- a/build/pkgs/boost_cropped/checksums.ini +++ b/build/pkgs/boost_cropped/checksums.ini @@ -1,4 +1,5 @@ tarball=boost_cropped-VERSION.tar.bz2 sha1=a00ffbbcaeefa2efd80fc6fc6ef1a295c165acd9 +sha256=f008c70cb82a30fd63f42f6a850fdfe344731b95e35e8a38d5a886cdf8efc921 md5=43b1d77344682e229ca8c702e42572b8 cksum=2257236793 diff --git a/build/pkgs/brial/checksums.ini b/build/pkgs/brial/checksums.ini index 2f3607207f7..48ce40b2759 100644 --- a/build/pkgs/brial/checksums.ini +++ b/build/pkgs/brial/checksums.ini @@ -1,5 +1,6 @@ tarball=brial-VERSION.tar.bz2 sha1=ea69faff56fb7068536723f3fb5b3583b8467831 +sha256=deb95fc1a99b6f9324f1278fcb676a605b77d59f24683d6af87f573cb46d0a4f md5=d6c6a01d4fc80062550e02d9185bfbff cksum=318826732 upstream_url=https://github.com/BRiAl/BRiAl/releases/download/VERSION/brial-VERSION.tar.bz2 diff --git a/build/pkgs/buckygen/checksums.ini b/build/pkgs/buckygen/checksums.ini index a27ce23059d..1c9af77579f 100644 --- a/build/pkgs/buckygen/checksums.ini +++ b/build/pkgs/buckygen/checksums.ini @@ -1,4 +1,5 @@ tarball=buckygen-VERSION.zip sha1=a106afecbd55ece18cd75b2e3be6720f5c599d79 +sha256=c151b33078913bed7f72977821d246c6dda5e01b64a53d963b5f95b65852e634 md5=ce46e081eaa23c1cb1004eafe24de831 cksum=1392809973 diff --git a/build/pkgs/bzip2/checksums.ini b/build/pkgs/bzip2/checksums.ini index 54dcf0c02ac..7172a563e3e 100644 --- a/build/pkgs/bzip2/checksums.ini +++ b/build/pkgs/bzip2/checksums.ini @@ -1,4 +1,5 @@ tarball=bzip2-VERSION.tar.gz sha1=ddccd26b2f94700ade5906b0648095b0ddac525c +sha256=296b7d4f9bccd58ebbb14d3317e9e97fdd0d7ff13e42cd32285faa626c75455f md5=80c416073bee97c9ae56f5c5efd29065 cksum=383440329 diff --git a/build/pkgs/cachetools/checksums.ini b/build/pkgs/cachetools/checksums.ini index 0ffe70b3b2f..8b7724701ad 100644 --- a/build/pkgs/cachetools/checksums.ini +++ b/build/pkgs/cachetools/checksums.ini @@ -1,5 +1,6 @@ tarball=cachetools-VERSION-py3-none-any.whl sha1=f7deaa4b10ae6d8955c83b0573e5b80f84e5d87a +sha256=95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 md5=7375eb8031ea2c95b91d2406c29e9379 cksum=3631496040 upstream_url=https://pypi.io/packages/py3/c/cachetools/cachetools-VERSION-py3-none-any.whl diff --git a/build/pkgs/calver/checksums.ini b/build/pkgs/calver/checksums.ini index 358cbc4cf7b..88e83d9309f 100644 --- a/build/pkgs/calver/checksums.ini +++ b/build/pkgs/calver/checksums.ini @@ -1,5 +1,6 @@ tarball=calver-VERSION-py3-none-any.whl sha1=4553e3fbfc58908f3be2dd529e5991986f6a46b5 +sha256=a1d7fcdd67797afc52ee36ffb8c8adf6643173864306547bfd1380cbce6310a0 md5=3c34037d7bd217efd99b738aa1a7744b cksum=3667684754 upstream_url=https://pypi.io/packages/py3/c/calver/calver-VERSION-py3-none-any.whl diff --git a/build/pkgs/cbc/checksums.ini b/build/pkgs/cbc/checksums.ini index 063d4b0c1df..3c8f48783e3 100644 --- a/build/pkgs/cbc/checksums.ini +++ b/build/pkgs/cbc/checksums.ini @@ -1,5 +1,6 @@ tarball=cbc-VERSION.tar.gz sha1=d937d6af1ee8838d44659ebd4cf7bbb1b20372ce +sha256=e39acffdac115e6b9c0d6f1afaf4f890f037007061d7ad4e0a47b95ec18db752 md5=2134576233cc95cdfedc63991a4944ec cksum=1215468781 upstream_url=https://github.com/coin-or/Cbc/archive/refs/tags/releases/VERSION.tar.gz diff --git a/build/pkgs/ccache/checksums.ini b/build/pkgs/ccache/checksums.ini index 97ad12917d0..aa8dafbe525 100644 --- a/build/pkgs/ccache/checksums.ini +++ b/build/pkgs/ccache/checksums.ini @@ -1,4 +1,5 @@ tarball=ccache-VERSION.tar.bz2 sha1=3653e0765f01697c449f7026c479fbd9526323a7 +sha256=fa9d7f38367431bc86b19ad107d709ca7ecf1574fdacca01698bdf0a47cd8567 md5=1f6ab79c60660f90c88f47708803605e cksum=1428047259 diff --git a/build/pkgs/cddlib/checksums.ini b/build/pkgs/cddlib/checksums.ini index 3da743b66b8..c9e83468a11 100644 --- a/build/pkgs/cddlib/checksums.ini +++ b/build/pkgs/cddlib/checksums.ini @@ -1,5 +1,6 @@ tarball=cddlib-VERSION.tar.gz sha1=8f38597a0479a191a62346dab89794e888c478b6 +sha256=70dffdb3369b8704dc75428a1b3c42ab9047b81ce039f12f427e2eb2b1b0dee2 md5=ec7f35912e34232b5306a643f99b6311 cksum=2420656558 upstream_url=https://github.com/cddlib/cddlib/releases/download/VERSION/cddlib-VERSION.tar.gz diff --git a/build/pkgs/certifi/checksums.ini b/build/pkgs/certifi/checksums.ini index aaa80e4d577..227cc29270b 100644 --- a/build/pkgs/certifi/checksums.ini +++ b/build/pkgs/certifi/checksums.ini @@ -1,5 +1,6 @@ tarball=certifi-VERSION-py3-none-any.whl sha1=9e99fff8d517d9c5b8d8fe6fe66bc31fa55b0fec +sha256=e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474 md5=c97d3905f6f805c9ccf70af93c7f0ace cksum=3858731419 upstream_url=https://pypi.io/packages/py3/c/certifi/certifi-VERSION-py3-none-any.whl diff --git a/build/pkgs/cffi/checksums.ini b/build/pkgs/cffi/checksums.ini index 5e9ebc003f4..4736b251320 100644 --- a/build/pkgs/cffi/checksums.ini +++ b/build/pkgs/cffi/checksums.ini @@ -1,5 +1,6 @@ tarball=cffi-VERSION.tar.gz sha1=c42a46cd11f6153f299cf10e9c236e8b2a143c21 +sha256=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 md5=f493860a6e98cd0c4178149568a6b4f6 cksum=585894851 upstream_url=https://pypi.io/packages/source/c/cffi/cffi-VERSION.tar.gz diff --git a/build/pkgs/chardet/checksums.ini b/build/pkgs/chardet/checksums.ini index 9911b1d139e..a02c86d03ec 100644 --- a/build/pkgs/chardet/checksums.ini +++ b/build/pkgs/chardet/checksums.ini @@ -1,5 +1,6 @@ tarball=chardet-VERSION-py3-none-any.whl sha1=2facc0387556aa8a2956ef682d49fc3eae56d30a +sha256=e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970 md5=b9eda7cd7d1582e269bd8eb7ffc4fcad cksum=1563594607 upstream_url=https://pypi.io/packages/py3/c/chardet/chardet-VERSION-py3-none-any.whl diff --git a/build/pkgs/charset_normalizer/checksums.ini b/build/pkgs/charset_normalizer/checksums.ini index 1d99f3fb73c..6e9c72bf058 100644 --- a/build/pkgs/charset_normalizer/checksums.ini +++ b/build/pkgs/charset_normalizer/checksums.ini @@ -1,5 +1,6 @@ tarball=charset_normalizer-VERSION-py3-none-any.whl sha1=1aa12424059bec1d95d9dda38b4ff6d062dededf +sha256=3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc md5=ea733f7299c80a232262a7f71a4fc698 cksum=984483622 upstream_url=https://pypi.io/packages/py3/c/charset_normalizer/charset_normalizer-VERSION-py3-none-any.whl diff --git a/build/pkgs/cliquer/checksums.ini b/build/pkgs/cliquer/checksums.ini index 112891b0960..15b4091c1ed 100644 --- a/build/pkgs/cliquer/checksums.ini +++ b/build/pkgs/cliquer/checksums.ini @@ -1,5 +1,6 @@ tarball=cliquer-VERSION.tar.gz sha1=2973abfcf84f9d098e8abbf4f0ac4b776c7f6105 +sha256=6ff79e1e9983ebabbca3dd276a8a310cbdeb48c7adf95f37abd83129b566340e md5=f37da2689c4f867407a9030a5cfc39e6 cksum=1511776397 upstream_url=https://github.com/dimpase/autocliquer/releases/download/vVERSION/cliquer-VERSION.tar.gz diff --git a/build/pkgs/cmake/checksums.ini b/build/pkgs/cmake/checksums.ini index 312edba61ff..b002b8e79ec 100644 --- a/build/pkgs/cmake/checksums.ini +++ b/build/pkgs/cmake/checksums.ini @@ -1,5 +1,6 @@ tarball=cmake-VERSION.tar.gz sha1=05de9ac807fefeb2a36ed5e8fcea376a00dd3d57 +sha256=fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc md5=df0e65607c9280a8df68b2c93eac4437 cksum=3851971657 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz diff --git a/build/pkgs/cocoalib/checksums.ini b/build/pkgs/cocoalib/checksums.ini index be2e5a19ad1..9759c40e769 100644 --- a/build/pkgs/cocoalib/checksums.ini +++ b/build/pkgs/cocoalib/checksums.ini @@ -1,4 +1,5 @@ tarball=CoCoALib-VERSION.tgz sha1=087b7fa3d905c47a6ff70e4e4cc2fbc031227631 +sha256=c7d3d69b44eefd316a456720aee4cf1fdf74ad9940f527646533fe1540add4ba md5=1cfc3b6ff549ea01e1bffaf3bc9600a8 cksum=2933468620 diff --git a/build/pkgs/colorama/checksums.ini b/build/pkgs/colorama/checksums.ini index e625d548a68..a0c4ec669ab 100644 --- a/build/pkgs/colorama/checksums.ini +++ b/build/pkgs/colorama/checksums.ini @@ -1,5 +1,6 @@ tarball=colorama-VERSION-py2.py3-none-any.whl sha1=d6ab1608850fecfc0e1cf50bf93d743695c04027 +sha256=4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 md5=3fc7a89530d68d7ea231ebe779c0db9c cksum=3297334831 upstream_url=https://pypi.io/packages/py2.py3/c/colorama/colorama-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/combinatorial_designs/checksums.ini b/build/pkgs/combinatorial_designs/checksums.ini index 9a1b121fce8..1f845f5b6ec 100644 --- a/build/pkgs/combinatorial_designs/checksums.ini +++ b/build/pkgs/combinatorial_designs/checksums.ini @@ -1,4 +1,5 @@ tarball=combinatorial_designs-VERSION.tar.bz2 sha1=353ba24217f9b7920890a784fd75dc59175f7196 +sha256=c9486c6d7ec71da338589a6e301723be4e55e02dcfc41f8dba11a682e3b3482e md5=f345a6918b1bcf34fcd71c2f26d10de0 cksum=131472289 diff --git a/build/pkgs/comm/checksums.ini b/build/pkgs/comm/checksums.ini index a3c7481f090..3c89c2242e4 100644 --- a/build/pkgs/comm/checksums.ini +++ b/build/pkgs/comm/checksums.ini @@ -1,5 +1,6 @@ tarball=comm-VERSION-py3-none-any.whl sha1=e7e20f9c1524a9fe059c0b6df90a68e1cd2115a9 +sha256=6d52794cba11b36ed9860999cd10fd02d6b2eac177068fdd585e1e2f8a96e67a md5=165e29c257c70498b61c7a31916727f2 cksum=2011044045 upstream_url=https://pypi.io/packages/py3/c/comm/comm-VERSION-py3-none-any.whl diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini index f4751b4da06..09ed5b06d26 100644 --- a/build/pkgs/contourpy/checksums.ini +++ b/build/pkgs/contourpy/checksums.ini @@ -1,5 +1,6 @@ tarball=contourpy-VERSION.tar.gz sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a +sha256=96ba37c2e24b7212a77da85004c38e7c4d155d3e72a45eeaf22c1f03f607e8ab md5=dd89f11007f39baec1e858ad1f464ea9 cksum=239770832 upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz diff --git a/build/pkgs/conway_polynomials/checksums.ini b/build/pkgs/conway_polynomials/checksums.ini index eeb24706c7d..188535c1258 100644 --- a/build/pkgs/conway_polynomials/checksums.ini +++ b/build/pkgs/conway_polynomials/checksums.ini @@ -1,5 +1,6 @@ tarball=conway-polynomials-VERSION.tar.gz sha1=cf0904c184d7f947eaae0de1b0e2e47411e9cfda +sha256=67ddcd7c0fa7a569fddd9ba70621423e638fd03646c1d4a375c8301f6b1100cb md5=ddc0e82da67120efc353a6ec29c4cca2 cksum=2976854063 upstream_url=https://files.pythonhosted.org/packages/source/c/conway-polynomials/conway-polynomials-VERSION.tar.gz diff --git a/build/pkgs/coxeter3/checksums.ini b/build/pkgs/coxeter3/checksums.ini index 906a9a3b784..718e333a9bb 100644 --- a/build/pkgs/coxeter3/checksums.ini +++ b/build/pkgs/coxeter3/checksums.ini @@ -1,4 +1,5 @@ tarball=coxeter-VERSION.tar.bz2 sha1=2f9ba814043c39ab4063ed31f384d908072cae4e +sha256=659e13317716148a70fee53c8555e494931b7820f41a1627f735c4c753ac1268 md5=46318ee161fd18b8a0c438b8a4f6c411 cksum=440369702 diff --git a/build/pkgs/cppy/checksums.ini b/build/pkgs/cppy/checksums.ini index 613b3b3f5b8..d68cbb535a5 100644 --- a/build/pkgs/cppy/checksums.ini +++ b/build/pkgs/cppy/checksums.ini @@ -1,5 +1,6 @@ tarball=cppy-VERSION.tar.gz sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f +sha256=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b md5=7c1f825c43dd66454440932a35b9969c cksum=1879136901 upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz diff --git a/build/pkgs/cryptominisat/checksums.ini b/build/pkgs/cryptominisat/checksums.ini index a3f569b739b..2756aab1ae5 100644 --- a/build/pkgs/cryptominisat/checksums.ini +++ b/build/pkgs/cryptominisat/checksums.ini @@ -1,5 +1,6 @@ tarball=cryptominisat-VERSION.tar.gz sha1=f79dfa1ffc6c9c75b3a33f76d3a89a3df2b3f4c2 +sha256=50153025c8503ef32f32fff847ee24871bb0fc1f0b13e17fe01aa762923f6d94 md5=05bdde77aa78c983849437e93b39bd6a cksum=462131608 upstream_url=https://github.com/msoos/cryptominisat/archive/refs/tags/VERSION.tar.gz diff --git a/build/pkgs/csdp/checksums.ini b/build/pkgs/csdp/checksums.ini index 90e65b23177..aa4da0208e0 100644 --- a/build/pkgs/csdp/checksums.ini +++ b/build/pkgs/csdp/checksums.ini @@ -1,4 +1,5 @@ tarball=csdp-VERSION.tar.gz sha1=017cbf067f190a2491692be6796f9b6af29c903e +sha256=4bc8d09eec34557c4f483b8fda6bb1ff9d00c659c91ca71fc8b4a77a14346be0 md5=520497cf33c3049a22b03681a5d717d8 cksum=127128634 diff --git a/build/pkgs/cunningham_tables/checksums.ini b/build/pkgs/cunningham_tables/checksums.ini index 360d9b647b7..1e609fa7e78 100644 --- a/build/pkgs/cunningham_tables/checksums.ini +++ b/build/pkgs/cunningham_tables/checksums.ini @@ -1,5 +1,6 @@ tarball=cunningham_tables-VERSION.tar.gz sha1=8bea1a113d85bb9c37d8f213dd19525d9d026f22 +sha256=ef39ab25bef5b1813071c9bd96abe3a9e683d5595c9654a3ffde5b07b7fe52b0 md5=e71b32f12e9a46c1c86e275e8441a06b cksum=1990403877 upstream_url=http://users.ox.ac.uk/~coml0531/sage/cunningham_tables-VERSION.tar.gz diff --git a/build/pkgs/curl/checksums.ini b/build/pkgs/curl/checksums.ini index 4dd30b4fc57..ed4b615d303 100644 --- a/build/pkgs/curl/checksums.ini +++ b/build/pkgs/curl/checksums.ini @@ -1,5 +1,6 @@ tarball=curl-VERSION.tar.bz2 sha1=0113fe762aed27d58c4e53ce2be7a98bc7f74957 +sha256=702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d md5=35fca80437f32dd7ef6c2e30b4916f06 cksum=1239842454 upstream_url=https://curl.se/download/curl-VERSION.tar.bz2 diff --git a/build/pkgs/cvxopt/checksums.ini b/build/pkgs/cvxopt/checksums.ini index a09000f2476..9f6e549bae8 100644 --- a/build/pkgs/cvxopt/checksums.ini +++ b/build/pkgs/cvxopt/checksums.ini @@ -1,5 +1,6 @@ tarball=cvxopt-VERSION.tar.gz sha1=f9c3c3fb61e87d27f05b3b66bc10734d5e6284e6 +sha256=3461fa42c1b2240ba4da1d985ca73503914157fc4c77417327ed6d7d85acdbe6 md5=ced06e7d92d8a10c84db94589e7f8162 cksum=2059529268 upstream_url=https://pypi.io/packages/source/c/cvxopt/cvxopt-VERSION.tar.gz diff --git a/build/pkgs/cvxpy/checksums.ini b/build/pkgs/cvxpy/checksums.ini index 3f76d4a6228..7f4a8be2660 100644 --- a/build/pkgs/cvxpy/checksums.ini +++ b/build/pkgs/cvxpy/checksums.ini @@ -1,5 +1,6 @@ tarball=cvxpy-VERSION.tar.gz sha1=1ca24d9e2ee5add13b33724ab9a11e747fe4ed99 +sha256=7a9ef34e3c57ff8c844d86f0a3834fb5575af19233947639de0ba577c6122e3e md5=da9fa9feb9634d3562057484b9822889 cksum=1557666297 upstream_url=https://pypi.io/packages/source/c/cvxpy/cvxpy-VERSION.tar.gz diff --git a/build/pkgs/cycler/checksums.ini b/build/pkgs/cycler/checksums.ini index b9f7e51759f..3e9e8ce4657 100644 --- a/build/pkgs/cycler/checksums.ini +++ b/build/pkgs/cycler/checksums.ini @@ -1,5 +1,6 @@ tarball=cycler-VERSION.tar.gz sha1=576c8605d33a8f70eccabf321ecc9e2fbdb9fb72 +sha256=9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f md5=4d0c25f418956e91c47163179682e0ef cksum=2916957464 upstream_url=https://files.pythonhosted.org/packages/source/c/cycler/cycler-VERSION.tar.gz diff --git a/build/pkgs/cylp/checksums.ini b/build/pkgs/cylp/checksums.ini index 570be6d38a8..1d365e3da21 100644 --- a/build/pkgs/cylp/checksums.ini +++ b/build/pkgs/cylp/checksums.ini @@ -1,5 +1,6 @@ tarball=cylp-VERSION.tar.gz sha1=22398052ca88123b77e691a0045806a030c9b259 +sha256=a7ee226caa274e190338da3d24314647df7e06599ab38cdd26c005d8b8258b16 md5=ac00f775af15afcee1b7932144441ec0 cksum=2746382211 upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz diff --git a/build/pkgs/cysignals/checksums.ini b/build/pkgs/cysignals/checksums.ini index 5c925fcc9ec..f48f68ec111 100644 --- a/build/pkgs/cysignals/checksums.ini +++ b/build/pkgs/cysignals/checksums.ini @@ -1,5 +1,6 @@ tarball=cysignals-VERSION.tar.gz sha1=76db7aa59d55e867c83b329c017382555253af43 +sha256=0f1e321e55a07f901c86a36a1e4497f6ff9dfe700681d0130a38c36e4eb238c3 md5=1837370e1d7f0b0acf1b97c3b7323b7d cksum=4114189395 upstream_url=https://pypi.io/packages/source/c/cysignals/cysignals-VERSION.tar.gz diff --git a/build/pkgs/cython/checksums.ini b/build/pkgs/cython/checksums.ini index 27694df1a8e..18e9b8994b6 100644 --- a/build/pkgs/cython/checksums.ini +++ b/build/pkgs/cython/checksums.ini @@ -1,5 +1,6 @@ tarball=Cython-VERSION.tar.gz sha1=48f0535ce0b05e0e4ae4daa6a597a2cdd76274f5 +sha256=fb299acf3a578573c190c858d49e0cf9d75f4bc49c3f24c5a63804997ef09213 md5=94ab8466d9350a31cfef3a0853c2fea5 cksum=2507297160 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz diff --git a/build/pkgs/d3js/checksums.ini b/build/pkgs/d3js/checksums.ini index 5cfe0dd2274..f1b09da7d9d 100644 --- a/build/pkgs/d3js/checksums.ini +++ b/build/pkgs/d3js/checksums.ini @@ -1,4 +1,5 @@ tarball=d3js-VERSION.tar.gz sha1=2fd4da34ca9e645cf81bf914d289c21c7bb8c166 +sha256=9c0120e72ac623fd8e0e9f9bec3f5998a523e822a26c86d4460c08172120c490 md5=d859a120f1eaebb8b563f4598868c564 cksum=527881311 diff --git a/build/pkgs/database_cremona_ellcurve/checksums.ini b/build/pkgs/database_cremona_ellcurve/checksums.ini index 9bb6711f674..709dddaea2a 100644 --- a/build/pkgs/database_cremona_ellcurve/checksums.ini +++ b/build/pkgs/database_cremona_ellcurve/checksums.ini @@ -1,4 +1,5 @@ tarball=database_cremona_ellcurve-20190911.tar.bz2 sha1=db8f87a70cc4103d617e0989e393f1343cacae6d +sha256=5d1d6aa35a95f9df123c87c1894791580d067444e1145bbd6ec20b4840f22053 md5=9399e69983c44d801f2d5bd2f3769d98 cksum=767500587 diff --git a/build/pkgs/database_cubic_hecke/checksums.ini b/build/pkgs/database_cubic_hecke/checksums.ini index b2119998ee2..50d1b41b0fd 100644 --- a/build/pkgs/database_cubic_hecke/checksums.ini +++ b/build/pkgs/database_cubic_hecke/checksums.ini @@ -1,5 +1,6 @@ tarball=database_cubic_hecke-VERSION.tar.gz sha1=f78ae31202fe077177f2c5059c028f9d40c20a46 +sha256=1c45ea30431698b0604924172e7e934e65d7db7e381f4173197704030b0c3bce md5=4f83516e155515f17ebd88c56bc0f31b cksum=3948466130 upstream_url=https://pypi.io/packages/source/d/database_cubic_hecke/database_cubic_hecke-VERSION.tar.gz diff --git a/build/pkgs/database_jones_numfield/checksums.ini b/build/pkgs/database_jones_numfield/checksums.ini index 69db10a25a8..5ab09a9d42d 100644 --- a/build/pkgs/database_jones_numfield/checksums.ini +++ b/build/pkgs/database_jones_numfield/checksums.ini @@ -1,4 +1,5 @@ tarball=database_jones_numfield-VERSION.tar.gz sha1=f7b1c4c330ff6be47ade4ec7fc14df9cebe8e2a8 +sha256=704d70101bc504bbdd2d7ac5847cb3bbc43e017c0ee163a9b4ab3ed2e572a001 md5=a8da4f207235a1de980a23a06e1e6d76 cksum=1843797635 diff --git a/build/pkgs/database_knotinfo/checksums.ini b/build/pkgs/database_knotinfo/checksums.ini index 6f174a26738..6832193ac85 100644 --- a/build/pkgs/database_knotinfo/checksums.ini +++ b/build/pkgs/database_knotinfo/checksums.ini @@ -1,5 +1,6 @@ tarball=database_knotinfo-VERSION.tar.gz sha1=d32a5640c59c25d49ee72770aedfc6daac7c3d0e +sha256=146506d11752ba10bdd2cc3d6fedb35f913ce44ccaca64c0ca17f5c2ede38ba1 md5=2d4104feee05547b542b1d86dd0f7675 cksum=2620016485 upstream_url=https://pypi.io/packages/source/d/database_knotinfo/database_knotinfo-VERSION.tar.gz diff --git a/build/pkgs/database_kohel/checksums.ini b/build/pkgs/database_kohel/checksums.ini index cd7679266e5..720a1b22416 100644 --- a/build/pkgs/database_kohel/checksums.ini +++ b/build/pkgs/database_kohel/checksums.ini @@ -1,4 +1,5 @@ tarball=database_kohel-VERSION.tar.gz sha1=ace5bed1eab66b4b0e9e74717cfcd8eb94c59d3f +sha256=0e05b6ee5306862cffddd61b5b8635841307b8fee8787b69c29a0d55b0650860 md5=5253b28e0a82f1fb88dc5cabb95ae578 cksum=1736717427 diff --git a/build/pkgs/database_mutation_class/checksums.ini b/build/pkgs/database_mutation_class/checksums.ini index cc4443b0928..b5f0b590d84 100644 --- a/build/pkgs/database_mutation_class/checksums.ini +++ b/build/pkgs/database_mutation_class/checksums.ini @@ -1,4 +1,5 @@ tarball=database_mutation_class-VERSION.tar.gz sha1=0e7eb2e89e1d4a612cb60e3d6be14d42f3e55678 +sha256=5105eed820e469bc0645788e23a47ff19420d3e398f5866df1424a05c67ee067 md5=8186b8f75eae76825399f3a9e6378c7b cksum=364985299 diff --git a/build/pkgs/database_odlyzko_zeta/checksums.ini b/build/pkgs/database_odlyzko_zeta/checksums.ini index 3c5cc103711..a74f4f2ef8f 100644 --- a/build/pkgs/database_odlyzko_zeta/checksums.ini +++ b/build/pkgs/database_odlyzko_zeta/checksums.ini @@ -1,4 +1,5 @@ tarball=database_odlyzko_zeta-VERSION.tar.bz2 sha1=97f586307d2f67a0a8594bd010602e2c4d5e0b4d +sha256=8919f01992718b9bf5c0602dbf16dd9d6f58b141b25f67f5cfd59f6cd0f9a0d4 md5=c93f63760540d5a787728a7a89ca2d9c cksum=3293740202 diff --git a/build/pkgs/database_stein_watkins/checksums.ini b/build/pkgs/database_stein_watkins/checksums.ini index 9192816cc06..e0f56643d12 100644 --- a/build/pkgs/database_stein_watkins/checksums.ini +++ b/build/pkgs/database_stein_watkins/checksums.ini @@ -1,4 +1,5 @@ tarball=database_stein_watkins-VERSION.tar.gz sha1=eecfb07fe2693e4baf301a0759d018a8842aba4d +sha256=00fd8610d6343968f853cfb49c4ed75fb2347a2953ea8d6d0fa0aa2a98d43f6f md5=e2ac1794dfaa0fdd9e7d12132c894c66 cksum=1440891220 diff --git a/build/pkgs/database_stein_watkins_mini/checksums.ini b/build/pkgs/database_stein_watkins_mini/checksums.ini index b88d9ff7a8a..78099b3651a 100644 --- a/build/pkgs/database_stein_watkins_mini/checksums.ini +++ b/build/pkgs/database_stein_watkins_mini/checksums.ini @@ -1,4 +1,5 @@ tarball=database_stein_watkins_mini-VERSION.tar.bz2 sha1=4979191668e7cc8490eda75044435519faab0f9c +sha256=adacd565277629238a14fd7d52f35a7516dfcd1d8875cb0c480cb56bd2cbb875 md5=24b2741b9e78449071624f79b7dd48b0 cksum=3178425274 diff --git a/build/pkgs/database_symbolic_data/checksums.ini b/build/pkgs/database_symbolic_data/checksums.ini index 36fc20b99aa..098ff2c7c45 100644 --- a/build/pkgs/database_symbolic_data/checksums.ini +++ b/build/pkgs/database_symbolic_data/checksums.ini @@ -1,4 +1,5 @@ tarball=database_symbolic_data-VERSION.tar.bz2 sha1=5f8532dacae12f36813ea609c6f511016955d1ee +sha256=97eb42d007296c9a41bce65ada5ebf84c9341eaeda0b35a060e2d327042eb7fe md5=4b0162e2efe22c942970cf2deaa38700 cksum=884432759 diff --git a/build/pkgs/dateutil/checksums.ini b/build/pkgs/dateutil/checksums.ini index 20fbeb61d10..273a12bee93 100644 --- a/build/pkgs/dateutil/checksums.ini +++ b/build/pkgs/dateutil/checksums.ini @@ -1,5 +1,6 @@ tarball=python-dateutil-VERSION.tar.gz sha1=c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 +sha256=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 md5=5970010bb72452344df3d76a10281b65 cksum=3093929984 upstream_url=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-VERSION.tar.gz diff --git a/build/pkgs/debugpy/checksums.ini b/build/pkgs/debugpy/checksums.ini index 43f1c2c84a5..55c3be8b7d9 100644 --- a/build/pkgs/debugpy/checksums.ini +++ b/build/pkgs/debugpy/checksums.ini @@ -1,5 +1,6 @@ tarball=debugpy-VERSION.zip sha1=af611dc5c401424196c27363379fc483814efe26 +sha256=12af2c55b419521e33d5fb21bd022df0b5eb267c3e178f1d374a63a2a6bdccd0 md5=b4a6173035b58a0ad61561a4c5017885 cksum=57995549 upstream_url=https://pypi.io/packages/source/d/debugpy/debugpy-VERSION.zip diff --git a/build/pkgs/decorator/checksums.ini b/build/pkgs/decorator/checksums.ini index 47bd53771d0..3be37bdfc4f 100644 --- a/build/pkgs/decorator/checksums.ini +++ b/build/pkgs/decorator/checksums.ini @@ -1,5 +1,6 @@ tarball=decorator-VERSION.tar.gz sha1=929f42916ac8a4aa973599d558768b8f1728db46 +sha256=637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 md5=a6b34700dcac8a4bb04efd55e99626c1 cksum=4154678061 upstream_url=https://pypi.io/packages/source/d/decorator/decorator-VERSION.tar.gz diff --git a/build/pkgs/deformation/checksums.ini b/build/pkgs/deformation/checksums.ini index a0996128077..ae30176ec84 100644 --- a/build/pkgs/deformation/checksums.ini +++ b/build/pkgs/deformation/checksums.ini @@ -1,5 +1,6 @@ tarball=deformation-VERSION.tar.bz2 sha1=0f5fd78a91da207d06b5be59bf466f16c2614eda +sha256=100dc7a28638b0a06227d07d2c1d1f872c65f9828e451e34e947aed109abbfcb md5=e2c365e20778117d402fb664fc145d72 cksum=3789646827 upstream_url=https://github.com/sagemath/deformation/archive/refs/tags/VERSION.tar.gz diff --git a/build/pkgs/defusedxml/checksums.ini b/build/pkgs/defusedxml/checksums.ini index c2cf328d5b2..1a6fa08a9a6 100644 --- a/build/pkgs/defusedxml/checksums.ini +++ b/build/pkgs/defusedxml/checksums.ini @@ -1,5 +1,6 @@ tarball=defusedxml-VERSION.tar.gz sha1=37667af1dc1357eb96b005c4f408ad5292d77b9f +sha256=1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69 md5=a50e7f21aa60a741efe6b1b658dfb3f8 cksum=3442371004 upstream_url=https://pypi.io/packages/source/d/defusedxml/defusedxml-VERSION.tar.gz diff --git a/build/pkgs/distlib/checksums.ini b/build/pkgs/distlib/checksums.ini index b1a05ffc295..3222f6b40c1 100644 --- a/build/pkgs/distlib/checksums.ini +++ b/build/pkgs/distlib/checksums.ini @@ -1,5 +1,6 @@ tarball=distlib-VERSION-py2.py3-none-any.whl sha1=97ea3bb71040f0348eaea272ec17fefea5806e87 +sha256=034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 md5=cf336842ba81996e554ae4eb2cd76d5d cksum=3779817199 upstream_url=https://pypi.io/packages/py2.py3/d/distlib/distlib-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/docutils/checksums.ini b/build/pkgs/docutils/checksums.ini index 784aac76419..e59aeba02d2 100644 --- a/build/pkgs/docutils/checksums.ini +++ b/build/pkgs/docutils/checksums.ini @@ -1,5 +1,6 @@ tarball=docutils-VERSION-py3-none-any.whl sha1=2bac2b2e9f4cc6d832588457c5f69bac79d80239 +sha256=96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6 md5=1d4506ff10777551614a128872523dfb cksum=2147344904 upstream_url=https://pypi.io/packages/py3/d/docutils/docutils-VERSION-py3-none-any.whl diff --git a/build/pkgs/dot2tex/checksums.ini b/build/pkgs/dot2tex/checksums.ini index 2409245334f..0f4cd10a8cd 100644 --- a/build/pkgs/dot2tex/checksums.ini +++ b/build/pkgs/dot2tex/checksums.ini @@ -1,4 +1,5 @@ tarball=dot2tex-VERSION.tar.gz sha1=5149c76e817b0592ea4dfd03f899495a394b8e90 +sha256=e7205ed17edf7e8a7a816f13da5c74fd8b88e1ad42cc3975a6943a32f59ad55b md5=b9ae1b7939409df221209098aaf11c97 cksum=557736523 diff --git a/build/pkgs/dsdp/checksums.ini b/build/pkgs/dsdp/checksums.ini index a82f4f651a8..4a674b278b2 100644 --- a/build/pkgs/dsdp/checksums.ini +++ b/build/pkgs/dsdp/checksums.ini @@ -1,5 +1,6 @@ tarball=dsdp_VERSION.orig.tar.gz sha1=d80b072acf5396561809266ff1c93e7927697aeb +sha256=de82af5e2daec70c8bf653ea4872108850bebea25238a799e78289ff88f88e06 md5=7f49a35f3fe7b5802d29ee2435fdb67e cksum=955095458 upstream_url=http://deb.debian.org/debian/pool/main/d/dsdp/dsdp_VERSION.orig.tar.gz diff --git a/build/pkgs/e_antic/checksums.ini b/build/pkgs/e_antic/checksums.ini index fe7fa852b76..850eccd27b3 100644 --- a/build/pkgs/e_antic/checksums.ini +++ b/build/pkgs/e_antic/checksums.ini @@ -1,5 +1,6 @@ tarball=e-antic-VERSION.tar.gz sha1=587052e189f9a7a145ac3144e6b7f11fca54b1ff +sha256=a38d2ab62c1b00fa2ee78f39039cc4d9d8e83de5fa5e2a18529ad34ab8976fe1 md5=0b54042461b28c4b45239480af062546 cksum=589498373 upstream_url=https://github.com/flatsurf/e-antic/releases/download/VERSION/e-antic-VERSION.tar.gz diff --git a/build/pkgs/ecl/checksums.ini b/build/pkgs/ecl/checksums.ini index 1afa214fd26..7342d5d6b73 100644 --- a/build/pkgs/ecl/checksums.ini +++ b/build/pkgs/ecl/checksums.ini @@ -1,5 +1,6 @@ tarball=ecl-VERSION.tgz sha1=612f61f87eedb271025095306eca78d19f3991db +sha256=c51bdab4ca6c1173dd3fe9cfe9727bcefb97bb0a3d6434b627ca6bdaeb33f880 md5=16bcfd2ce9730691f88e74edaab790af cksum=1542706373 upstream_url=https://common-lisp.net/project/ecl/static/files/release/ecl-VERSION.tgz diff --git a/build/pkgs/eclib/checksums.ini b/build/pkgs/eclib/checksums.ini index b6a7efd95aa..8bab8e64a6b 100644 --- a/build/pkgs/eclib/checksums.ini +++ b/build/pkgs/eclib/checksums.ini @@ -1,5 +1,6 @@ tarball=eclib-VERSION.tar.bz2 sha1=3028ac95e1b76699f5f9e871ac706cda363ab842 +sha256=32d116a3e359b0de4f6486c2bb6188bb8b553c8b833f618cc2596484e8b6145a md5=c96e1bb39a50552aeac6675b907709b8 cksum=2027019032 upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2 diff --git a/build/pkgs/ecm/checksums.ini b/build/pkgs/ecm/checksums.ini index 20289bd49ec..4c3906b7810 100644 --- a/build/pkgs/ecm/checksums.ini +++ b/build/pkgs/ecm/checksums.ini @@ -1,5 +1,6 @@ tarball=ecm-VERSION.tar.gz sha1=f35d225d1d44f9b8ad420bf9b50a92582f681337 +sha256=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8 md5=cfbb789d76cf538fc4dbb99d8e6e4b81 cksum=2195620014 upstream_url=https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-VERSION.tar.gz diff --git a/build/pkgs/ecos_python/checksums.ini b/build/pkgs/ecos_python/checksums.ini index dc6d7b9a6f1..9a58eff09af 100644 --- a/build/pkgs/ecos_python/checksums.ini +++ b/build/pkgs/ecos_python/checksums.ini @@ -1,5 +1,6 @@ tarball=ecos-VERSION.tar.gz sha1=7afce63aec44522052e05fa2e1c82e12fe20fd45 +sha256=f48816d73b87ae325556ea537b7c8743187311403c80e3832035224156337c4e md5=a76939695aa07f8ab2f01a532732f348 cksum=2810151369 upstream_url=https://pypi.io/packages/source/e/ecos/ecos-VERSION.tar.gz diff --git a/build/pkgs/editables/checksums.ini b/build/pkgs/editables/checksums.ini index 52c7fa0b03b..f61e33020aa 100644 --- a/build/pkgs/editables/checksums.ini +++ b/build/pkgs/editables/checksums.ini @@ -1,5 +1,6 @@ tarball=editables-VERSION.tar.gz sha1=90efed858e78bf6276d1a5959ec6692e11a6bce9 +sha256=309627d9b5c4adc0e668d8c6fa7bac1ba7c8c5d415c2d27f60f081f8e80d1de2 md5=520de8c3a9dc5dfb2b365d104541c9de cksum=3074203672 upstream_url=https://pypi.io/packages/source/e/editables/editables-VERSION.tar.gz diff --git a/build/pkgs/elliptic_curves/checksums.ini b/build/pkgs/elliptic_curves/checksums.ini index 8af491ec7d4..fdd2cab5516 100644 --- a/build/pkgs/elliptic_curves/checksums.ini +++ b/build/pkgs/elliptic_curves/checksums.ini @@ -1,4 +1,5 @@ tarball=elliptic_curves-VERSION.tar.bz2 sha1=1eb0d332be1d05aaee70cd03cce7299a1df95953 +sha256=5fba5470d9d91f06282ed5edfc45bf0ea1c5f7c8d4837c46234b17be1481fd50 md5=315564f43d9272a2659f91355e6b1d16 cksum=3923089644 diff --git a/build/pkgs/entrypoints/checksums.ini b/build/pkgs/entrypoints/checksums.ini index 88c67871e54..1b14748354d 100644 --- a/build/pkgs/entrypoints/checksums.ini +++ b/build/pkgs/entrypoints/checksums.ini @@ -1,5 +1,6 @@ tarball=entrypoints-VERSION.tar.gz sha1=ca5c5976781db7ec6e8faece06af31ff32960529 +sha256=b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4 md5=3acd8b72119a8fb1eac7030c24ac6b49 cksum=3193499805 upstream_url=https://pypi.io/packages/source/e/entrypoints/entrypoints-VERSION.tar.gz diff --git a/build/pkgs/exceptiongroup/checksums.ini b/build/pkgs/exceptiongroup/checksums.ini index 1ca0c50d46d..ef8db57925c 100644 --- a/build/pkgs/exceptiongroup/checksums.ini +++ b/build/pkgs/exceptiongroup/checksums.ini @@ -1,5 +1,6 @@ tarball=exceptiongroup-VERSION-py3-none-any.whl sha1=e69c438e6d15111c4f7cc18224b31a42a58663da +sha256=4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14 md5=d252c64173c449dc34654e7be8211744 cksum=527795480 upstream_url=https://pypi.io/packages/py3/e/exceptiongroup/exceptiongroup-VERSION-py3-none-any.whl diff --git a/build/pkgs/executing/checksums.ini b/build/pkgs/executing/checksums.ini index 71e107aafbe..fb9ab40fb18 100644 --- a/build/pkgs/executing/checksums.ini +++ b/build/pkgs/executing/checksums.ini @@ -1,5 +1,6 @@ tarball=executing-VERSION.tar.gz sha1=ac9b0cbedd1166bce7a3b9f8542f8d1fafdd8c73 +sha256=19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 md5=e6fa9a6abf00555ccc8a6b3524729238 cksum=1761713270 upstream_url=https://pypi.io/packages/source/e/executing/executing-VERSION.tar.gz diff --git a/build/pkgs/fastjsonschema/checksums.ini b/build/pkgs/fastjsonschema/checksums.ini index 3df871d077a..37a25ce9db0 100644 --- a/build/pkgs/fastjsonschema/checksums.ini +++ b/build/pkgs/fastjsonschema/checksums.ini @@ -1,5 +1,6 @@ tarball=fastjsonschema-VERSION.tar.gz sha1=eab76262783dd81303e2b1da0914a1d5a7f388aa +sha256=e820349dd16f806e4bd1467a138dced9def4bc7d6213a34295272a6cac95b5bd md5=4dd3d7946af566fc32e30f0768cddae3 cksum=2794560071 upstream_url=https://pypi.io/packages/source/f/fastjsonschema/fastjsonschema-VERSION.tar.gz diff --git a/build/pkgs/fflas_ffpack/checksums.ini b/build/pkgs/fflas_ffpack/checksums.ini index 89023b57d1e..25108e7990e 100644 --- a/build/pkgs/fflas_ffpack/checksums.ini +++ b/build/pkgs/fflas_ffpack/checksums.ini @@ -1,4 +1,5 @@ tarball=fflas_ffpack-VERSION.tar.bz2 sha1=c221513710b98e0e62153f424a9725c5be2ff62a +sha256=d4ecfc6289c7077185ed5e58fa77d07fdb034c1a74385366566226a4887c50c3 md5=05c77ea30394cacd53b7aed6ffba1e7b cksum=3775757878 diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini index 6c597d2d7aa..441476e39c2 100644 --- a/build/pkgs/filelock/checksums.ini +++ b/build/pkgs/filelock/checksums.ini @@ -1,5 +1,6 @@ tarball=filelock-VERSION-py3-none-any.whl sha1=f1fa92751023660a10b248f8559d09f3c461403f +sha256=57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c md5=d0af0f1a2ee56c24f630ece278cb062f cksum=3749691502 upstream_url=https://pypi.io/packages/py3/f/filelock/filelock-VERSION-py3-none-any.whl diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index ab836606657..76e95967041 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,5 +1,6 @@ tarball=flint-VERSION.tar.gz sha1=65be9297c06edd7e24f20874b7bd6130cee56723 +sha256=7b311a00503a863881eb8177dbeb84322f29399f3d7d72f3b1a4c9ba1d5794b4 md5=5189f67b0ec12e4a54d6782851642b81 cksum=172350473 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz diff --git a/build/pkgs/flit_core/checksums.ini b/build/pkgs/flit_core/checksums.ini index b93e9200816..a8043a35077 100644 --- a/build/pkgs/flit_core/checksums.ini +++ b/build/pkgs/flit_core/checksums.ini @@ -1,5 +1,6 @@ tarball=flit_core-VERSION-py3-none-any.whl sha1=cf044db53e986d0735ad708cce9eba0b71684168 +sha256=7aada352fb0c7f5538c4fafeddf314d3a6a92ee8e2b1de70482329e42de70301 md5=c817750ae741d8f720b173a30f7b2085 cksum=1810686358 upstream_url=https://pypi.io/packages/py3/f/flit_core/flit_core-VERSION-py3-none-any.whl diff --git a/build/pkgs/fonttools/checksums.ini b/build/pkgs/fonttools/checksums.ini index b0aa6d12927..39bbfbdfc88 100644 --- a/build/pkgs/fonttools/checksums.ini +++ b/build/pkgs/fonttools/checksums.ini @@ -1,5 +1,6 @@ tarball=fonttools-VERSION.tar.gz sha1=5432f0273040b044e8d6465947e3a4c00097bdbf +sha256=c391cd5af88aacaf41dd7cfb96eeedfad297b5899a39e12f4c2c3706d0a3329d md5=039956b85e9b84ba53373b0df644f5ad cksum=3441365368 upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.tar.gz diff --git a/build/pkgs/fplll/checksums.ini b/build/pkgs/fplll/checksums.ini index 5f9ec9753be..4daa8f39890 100644 --- a/build/pkgs/fplll/checksums.ini +++ b/build/pkgs/fplll/checksums.ini @@ -1,5 +1,6 @@ tarball=fplll-VERSION.tar.gz sha1=607f5922109d93ddd5a05419682511e26579f9d6 +sha256=76d3778f0326597ed7505bab19493a9bf6b73a5c5ca614e8fb82f42105c57d00 md5=fa4e1f24994c0345a9530397a3369b27 cksum=4174005926 upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz diff --git a/build/pkgs/fpylll/checksums.ini b/build/pkgs/fpylll/checksums.ini index 156fc587670..ad9d2a83f7b 100644 --- a/build/pkgs/fpylll/checksums.ini +++ b/build/pkgs/fpylll/checksums.ini @@ -1,5 +1,6 @@ tarball=fpylll-VERSION.tar.gz sha1=f23835208fc048028c849bb5b566f2fe631df7f4 +sha256=623b4619b6da9fed9ba26b1ac7e8d8e620a06d2a5f7095ee67985c7160d3c3a4 md5=c81a1af8ecf57ae740366a110dfbbbaf cksum=398170701 upstream_url=https://pypi.io/packages/source/f/fpylll/fpylll-VERSION.tar.gz diff --git a/build/pkgs/fqdn/checksums.ini b/build/pkgs/fqdn/checksums.ini index 423dc55e68f..97ca12a5d73 100644 --- a/build/pkgs/fqdn/checksums.ini +++ b/build/pkgs/fqdn/checksums.ini @@ -1,5 +1,6 @@ tarball=fqdn-VERSION-py3-none-any.whl sha1=85a7ac7d7f45d2e0b64c4b7653ab277ceec91ecf +sha256=3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014 md5=376c19af0cd5029cd8b36d1042a1490e cksum=4276482151 upstream_url=https://pypi.io/packages/py3/f/fqdn/fqdn-VERSION-py3-none-any.whl diff --git a/build/pkgs/freetype/checksums.ini b/build/pkgs/freetype/checksums.ini index 704e1b370d5..eff2e1130f7 100644 --- a/build/pkgs/freetype/checksums.ini +++ b/build/pkgs/freetype/checksums.ini @@ -1,5 +1,6 @@ tarball=freetype-VERSION.tar.bz2 sha1=040d6a4be23708132c85ef9df837eb3f8a04c4ab +sha256=5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac md5=4934a8b61b636920bcce58e7c7f3e1a2 cksum=2814275332 upstream_url=https://download.savannah.gnu.org/releases/freetype/freetype-VERSION.tar.gz diff --git a/build/pkgs/fricas/checksums.ini b/build/pkgs/fricas/checksums.ini index 965d2f17f01..0e89a270d86 100644 --- a/build/pkgs/fricas/checksums.ini +++ b/build/pkgs/fricas/checksums.ini @@ -1,5 +1,6 @@ tarball=fricas-VERSION-full.tar.bz2 sha1=6f2c1ae5eb71daab871d1814b26f596363c8e925 +sha256=6a60063cb428ef49ca013c9933b877c97e66314c42c0e1706ff7d32160798544 md5=504b431c39e498527e6f9c739c973488 cksum=2469663675 upstream_url=https://github.com/fricas/fricas/releases/download/VERSION/fricas-VERSION-full.tar.bz2 diff --git a/build/pkgs/frobby/checksums.ini b/build/pkgs/frobby/checksums.ini index 8d2575db5d2..82d050eb088 100644 --- a/build/pkgs/frobby/checksums.ini +++ b/build/pkgs/frobby/checksums.ini @@ -1,4 +1,5 @@ tarball=frobby_v0.9.0.tar.gz sha1=513b6e2ef8e8670c0518d168c2e554df1f8d79b4 +sha256=af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df md5=2204f340dad8fb7be156f9f7c403c4a0 cksum=2889611419 diff --git a/build/pkgs/furo/checksums.ini b/build/pkgs/furo/checksums.ini index e9219c0b481..27b7f0f1903 100644 --- a/build/pkgs/furo/checksums.ini +++ b/build/pkgs/furo/checksums.ini @@ -1,5 +1,6 @@ tarball=furo-VERSION-py3-none-any.whl sha1=21afca1ac0f309541bfd5b89e61097a1bd4b681e +sha256=513092538537dc5c596691da06e3c370714ec99bc438680edc1debffb73e5bfc md5=a7c552d8bc7b504b528414043f91671b cksum=2089555908 upstream_url=https://pypi.io/packages/py3/f/furo/furo-VERSION-py3-none-any.whl diff --git a/build/pkgs/gambit/checksums.ini b/build/pkgs/gambit/checksums.ini index 132796d9573..b33d63f512e 100644 --- a/build/pkgs/gambit/checksums.ini +++ b/build/pkgs/gambit/checksums.ini @@ -1,4 +1,5 @@ tarball=gambit-VERSION.tar.gz sha1=603dd52e8c0c2881bc2fdc8523bd8cbd9106b36f +sha256=7ede51739dc868242886815bb875307f5e11bb3789f22c546d3c83194fe75a1c md5=db47a02f66644806dbd43f77dc41ebeb cksum=2352708160 diff --git a/build/pkgs/gap/checksums.ini b/build/pkgs/gap/checksums.ini index b0ea8ba8818..fcf5ab4e8ce 100644 --- a/build/pkgs/gap/checksums.ini +++ b/build/pkgs/gap/checksums.ini @@ -1,5 +1,6 @@ tarball=gap-VERSION.tar.gz sha1=a6e36f3f874a2c46f51561402634497eab705cca +sha256=672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8 md5=c5cd9f272f2703d7a3649ad7193b2d90 cksum=2760477284 upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz diff --git a/build/pkgs/gap3/checksums.ini b/build/pkgs/gap3/checksums.ini index 93a6920959a..354babc8065 100644 --- a/build/pkgs/gap3/checksums.ini +++ b/build/pkgs/gap3/checksums.ini @@ -1,4 +1,5 @@ tarball=gap3-VERSION.tar.gz sha1=c730fb20e850fc5d4ac98569d717d20967e88086 +sha256=07d90b63f504c67bb463fad470544d18619e25539fec7cfb74343a1a982d3b75 md5=edc04e9080e4b020400deb5d90e5a528 cksum=3976232974 diff --git a/build/pkgs/gap_jupyter/checksums.ini b/build/pkgs/gap_jupyter/checksums.ini index fcea05efa44..8722b3103b1 100644 --- a/build/pkgs/gap_jupyter/checksums.ini +++ b/build/pkgs/gap_jupyter/checksums.ini @@ -1,4 +1,5 @@ tarball=jupyter-kernel-gap-VERSION.tar.gz sha1=9536aa352c6dee815ae5179e3971bfb9216f8eda +sha256=8c62f3c290ac6eea94e4f1d35067b74261eea67c400b0aaa8d1f9451df0e963f md5=f5853cc8cd62ce495be8d3c8bdb2500f cksum=3578940226 diff --git a/build/pkgs/gast/checksums.ini b/build/pkgs/gast/checksums.ini index 57bc0736a13..04bcc2ff13a 100644 --- a/build/pkgs/gast/checksums.ini +++ b/build/pkgs/gast/checksums.ini @@ -1,5 +1,6 @@ tarball=gast-VERSION.tar.gz sha1=6c113cf8d33cc654d33210335103485ab41d3dbb +sha256=9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97 md5=907c689e3fdbc7a48cc010e665195baa cksum=218846575 upstream_url=https://pypi.io/packages/source/g/gast/gast-VERSION.tar.gz diff --git a/build/pkgs/gc/checksums.ini b/build/pkgs/gc/checksums.ini index 828d7e35d93..83651e93f3e 100644 --- a/build/pkgs/gc/checksums.ini +++ b/build/pkgs/gc/checksums.ini @@ -1,5 +1,6 @@ tarball=gc-VERSION.tar.gz sha1=41c88cbc4bc9bf76e1a95a1500ea5b0360bc4f55 +sha256=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2 md5=8901a6ed29ac35842420054772ea3441 cksum=4201205407 upstream_url=https://github.com/ivmai/bdwgc/releases/download/vVERSION/gc-VERSION.tar.gz diff --git a/build/pkgs/gcc/checksums.ini b/build/pkgs/gcc/checksums.ini index 996f8360f45..6be034ebf90 100644 --- a/build/pkgs/gcc/checksums.ini +++ b/build/pkgs/gcc/checksums.ini @@ -1,5 +1,6 @@ tarball=gcc-VERSION.tar.xz sha1=5dce6dc0091b8049b530d1587513a07201691760 +sha256=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff md5=73bafd0af874439dcdb9fc063b6fb069 cksum=2807184004 upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz diff --git a/build/pkgs/gdb/checksums.ini b/build/pkgs/gdb/checksums.ini index 77c8a53f025..3b6841b8947 100644 --- a/build/pkgs/gdb/checksums.ini +++ b/build/pkgs/gdb/checksums.ini @@ -1,4 +1,5 @@ tarball=gdb-VERSION.tar.xz sha1=ee66294d87a109f88a459d0da5d0bb2da5135f45 +sha256=c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39 md5=b5a49dbff00d9a87fbe114d14b3101c0 cksum=4115301181 diff --git a/build/pkgs/gengetopt/checksums.ini b/build/pkgs/gengetopt/checksums.ini index 189f6c0aaca..a4d02cde58b 100644 --- a/build/pkgs/gengetopt/checksums.ini +++ b/build/pkgs/gengetopt/checksums.ini @@ -1,5 +1,6 @@ tarball=gengetopt-VERSION.tar.xz sha1=0d5979af61a7be309898608803056aeebe3a3657 +sha256=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac md5=ea165d618640dbdecb42ae4491337965 cksum=3423561524 upstream_url=ftp://ftp.gnu.org/gnu/gengetopt/gengetopt-VERSION.tar.xz diff --git a/build/pkgs/gf2x/checksums.ini b/build/pkgs/gf2x/checksums.ini index 0eaf7657e40..31fcf534c50 100644 --- a/build/pkgs/gf2x/checksums.ini +++ b/build/pkgs/gf2x/checksums.ini @@ -1,5 +1,6 @@ tarball=gf2x-VERSION.tar.gz sha1=1b9c7e14031afc5488b9aa27f5501f78c90f00b4 +sha256=9472cd651972a1de38e3c4c47697a86e0ecf19d7d33454d4bc2a62bc85841b59 md5=842f087ce423c279dced26b85b0fd1d0 cksum=3368093312 upstream_url=https://gitlab.inria.fr/gf2x/gf2x/uploads/c46b1047ba841c20d1225ae73ad6e4cd/gf2x-VERSION.tar.gz diff --git a/build/pkgs/gfan/checksums.ini b/build/pkgs/gfan/checksums.ini index 698a6ae1cee..21ede700e5e 100644 --- a/build/pkgs/gfan/checksums.ini +++ b/build/pkgs/gfan/checksums.ini @@ -1,4 +1,5 @@ tarball=gfanVERSION.tar.gz sha1=5649d22e01da8c5c90d5adac2c601e6dfe71c568 +sha256=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a md5=b518358c7a399075ff6dd658885382c8 cksum=3811041742 diff --git a/build/pkgs/giac/checksums.ini b/build/pkgs/giac/checksums.ini index 089c15f34b4..930026d75d1 100644 --- a/build/pkgs/giac/checksums.ini +++ b/build/pkgs/giac/checksums.ini @@ -1,4 +1,5 @@ tarball=giac-VERSION.tar.bz2 sha1=78c15badd19b49b7d111ac204b611a4378ce3d15 +sha256=aa5dbefd4b410012a61756904d6dc1c186a4719db414a2ad7cf876ae933ff96b md5=8fbd43a5c60848b6813b7fc8698a0199 cksum=1923149665 diff --git a/build/pkgs/givaro/checksums.ini b/build/pkgs/givaro/checksums.ini index 27466082a40..9af27bf5629 100644 --- a/build/pkgs/givaro/checksums.ini +++ b/build/pkgs/givaro/checksums.ini @@ -1,4 +1,5 @@ tarball=givaro-VERSION.tar.gz sha1=2e7af1537d6f8325578a54d5b8092c990028863d +sha256=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f md5=b27c7713fcdced257df5f17b7bec8fd5 cksum=731010730 diff --git a/build/pkgs/glpk/checksums.ini b/build/pkgs/glpk/checksums.ini index 958baa4e135..48d314fe29e 100644 --- a/build/pkgs/glpk/checksums.ini +++ b/build/pkgs/glpk/checksums.ini @@ -1,5 +1,6 @@ tarball=glpk-VERSION.tar.bz2 sha1=3a85b1e4c806b91deebfcf9a845b9308cd785d64 +sha256=4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15 md5=91499dc0c139b221846cae60e5c7d222 cksum=1522314071 upstream_url=https://ftp.gnu.org/gnu/glpk/glpk-VERSION.tar.gz diff --git a/build/pkgs/glucose/checksums.ini b/build/pkgs/glucose/checksums.ini index 56885793b64..582c93faaf4 100644 --- a/build/pkgs/glucose/checksums.ini +++ b/build/pkgs/glucose/checksums.ini @@ -1,4 +1,5 @@ tarball=glucose-syrup-VERSION.tgz sha1=5442dff37b8ea113b572bffa27a19314af14a137 +sha256=51aa1cf1bed2b14f1543b099e85a56dd1a92be37e6e3eb0c4a1fd883d5cc5029 md5=7f13be91b3cd71bd02d4f37570fee011 cksum=3190126613 diff --git a/build/pkgs/gmp/checksums.ini b/build/pkgs/gmp/checksums.ini index 6a595d8b7c3..b7bf83ce179 100644 --- a/build/pkgs/gmp/checksums.ini +++ b/build/pkgs/gmp/checksums.ini @@ -1,5 +1,6 @@ tarball=gmp-VERSION.tar.xz sha1=b4043dd2964ab1a858109da85c44de224384f352 +sha256=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 md5=956dc04e864001a9c22429f761f2c283 cksum=1735788654 upstream_url=https://gmplib.org/download/gmp/gmp-VERSION.tar.xz diff --git a/build/pkgs/gmpy2/checksums.ini b/build/pkgs/gmpy2/checksums.ini index e852852d410..39500add526 100644 --- a/build/pkgs/gmpy2/checksums.ini +++ b/build/pkgs/gmpy2/checksums.ini @@ -1,5 +1,6 @@ tarball=gmpy2-VERSION.tar.gz sha1=700ef438964acd286d52e973a833cd57ae9a7ad7 +sha256=3b8acc939a40411a8ad5541ed178ff866dd1759e667ee26fe34c9291b6b350c3 md5=72b93048015b28efcf92ed702014a61c cksum=3542820546 upstream_url=https://pypi.io/packages/source/g/gmpy2/gmpy2-VERSION.tar.gz diff --git a/build/pkgs/gnumake_tokenpool/checksums.ini b/build/pkgs/gnumake_tokenpool/checksums.ini index 76c234c4404..3d0447bc540 100644 --- a/build/pkgs/gnumake_tokenpool/checksums.ini +++ b/build/pkgs/gnumake_tokenpool/checksums.ini @@ -1,5 +1,6 @@ tarball=gnumake_tokenpool-VERSION-py3-none-any.whl sha1=882c694dc3c0a935275a8d2acd9e766399719754 +sha256=0c49578df1a76b6ff7724b99053d96f1583bd3e52fe9547587cfb6ffdb0d1fcd md5=cc18b6c7a339d8140f5b2dc248ef24bc cksum=2989045922 upstream_url=https://pypi.io/packages/py3/g/gnumake_tokenpool/gnumake_tokenpool-VERSION-py3-none-any.whl diff --git a/build/pkgs/gp2c/checksums.ini b/build/pkgs/gp2c/checksums.ini index d8b896e2ed5..b7876120c73 100644 --- a/build/pkgs/gp2c/checksums.ini +++ b/build/pkgs/gp2c/checksums.ini @@ -1,4 +1,5 @@ tarball=gp2c-VERSION.tar.gz sha1=6bce2bbb69227de44fa768619d1dffa861d6470a +sha256=e0f89183ae4ea24fc41e1da3df3cca11e4f7061237cee0553082c7806ef917f6 md5=41d3e76fb070ba7f73242b76ae5cb529 cksum=2256538341 diff --git a/build/pkgs/graphs/checksums.ini b/build/pkgs/graphs/checksums.ini index 7ec4a8a6ada..0e13b75d34b 100644 --- a/build/pkgs/graphs/checksums.ini +++ b/build/pkgs/graphs/checksums.ini @@ -1,5 +1,6 @@ tarball=graphs-VERSION.tar.bz2 sha1=c3b9fcbc92482efd6b7f6f3a33df5a78e1256aa1 +sha256=07237c0d9853611505c389fd7bb92500c8743f5631babb4d0f45dfd8332f3741 md5=4357919410e8ac2611c9fe643976c8ff cksum=2340933149 upstream_url=http://users.ox.ac.uk/~coml0531/sage/graphs-VERSION.tar.bz2 diff --git a/build/pkgs/gsl/checksums.ini b/build/pkgs/gsl/checksums.ini index 8bef7d5f43c..9b3176c71c6 100644 --- a/build/pkgs/gsl/checksums.ini +++ b/build/pkgs/gsl/checksums.ini @@ -1,5 +1,6 @@ tarball=gsl-VERSION.tar.gz sha1=549e1105cd1198537be9707257161531e109bd94 +sha256=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b md5=36aee97e67f64dbdab7afae197e3483b cksum=171022903 upstream_url=https://ftp.gnu.org/gnu/gsl/gsl-VERSION.tar.gz diff --git a/build/pkgs/h11/checksums.ini b/build/pkgs/h11/checksums.ini index 19d629f0852..147c2a48f28 100644 --- a/build/pkgs/h11/checksums.ini +++ b/build/pkgs/h11/checksums.ini @@ -1,5 +1,6 @@ tarball=h11-VERSION-py3-none-any.whl sha1=c502d56dc3288212142a398704a5109749331dd8 +sha256=e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761 md5=47f19bfed53c8f9278749c532490977e cksum=462065947 upstream_url=https://pypi.io/packages/py3/h/h11/h11-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini index 6da100dad5a..5e4a296724f 100644 --- a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini +++ b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini @@ -1,5 +1,6 @@ tarball=hatch_fancy_pypi_readme-VERSION-py3-none-any.whl sha1=4076ea14577b3c711a8345498d8f91b1c8a13d09 +sha256=9a2c0e5d527611701858083bfb355876f26e04a075342b7d4da725ba5a6dd6ea md5=d7acd13333f6c71dcbfa62420c7f257b cksum=1527082323 upstream_url=https://pypi.io/packages/py3/h/hatch_fancy_pypi_readme/hatch_fancy_pypi_readme-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatch_vcs/checksums.ini b/build/pkgs/hatch_vcs/checksums.ini index e9908b1540e..9d9c791717d 100644 --- a/build/pkgs/hatch_vcs/checksums.ini +++ b/build/pkgs/hatch_vcs/checksums.ini @@ -1,5 +1,6 @@ tarball=hatch_vcs-VERSION-py3-none-any.whl sha1=a4da813bf9a745ed2020bf462f4bc19a1ab7fc11 +sha256=b8a2b6bee54cf6f9fc93762db73890017ae59c9081d1038a41f16235ceaf8b2c md5=82bee9889b95170e550c98f8dd11bc61 cksum=1575327634 upstream_url=https://pypi.io/packages/py3/h/hatch_vcs/hatch_vcs-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatchling/checksums.ini b/build/pkgs/hatchling/checksums.ini index 5d8b02696c5..cc5f435bae5 100644 --- a/build/pkgs/hatchling/checksums.ini +++ b/build/pkgs/hatchling/checksums.ini @@ -1,5 +1,6 @@ tarball=hatchling-VERSION-py3-none-any.whl sha1=aa9d69b9dd820716440252d737a4aeaf9b4e541f +sha256=872c63aa7e8aca85e8dba07b05c6a9b28d5a149fe00638f1a47e36930197248f md5=20e5ea4deea21f91759fb2269b71f0dd cksum=446304413 upstream_url=https://pypi.io/packages/py3/h/hatchling/hatchling-VERSION-py3-none-any.whl diff --git a/build/pkgs/httpcore/checksums.ini b/build/pkgs/httpcore/checksums.ini index 81e08584fbe..f4b275c790f 100644 --- a/build/pkgs/httpcore/checksums.ini +++ b/build/pkgs/httpcore/checksums.ini @@ -1,5 +1,6 @@ tarball=httpcore-VERSION-py3-none-any.whl sha1=e83eb30232906df8ac673d6c49c657957dc00ce1 +sha256=ac418c1db41bade2ad53ae2f3834a3a0f5ae76b56cf5aa497d2d033384fc7d73 md5=9f99e1b4ed8ba940bd698e21af54ef6d cksum=2564019022 upstream_url=https://pypi.io/packages/py3/h/httpcore/httpcore-VERSION-py3-none-any.whl diff --git a/build/pkgs/httpx/checksums.ini b/build/pkgs/httpx/checksums.ini index 11b2b37b2f2..d4363d5f6ad 100644 --- a/build/pkgs/httpx/checksums.ini +++ b/build/pkgs/httpx/checksums.ini @@ -1,5 +1,6 @@ tarball=httpx-VERSION-py3-none-any.whl sha1=01f2a657e43842cb7c8dda30d38860fa741acb7e +sha256=71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 md5=9bab916547b4c85999c568d12e04edc4 cksum=4048488492 upstream_url=https://pypi.io/packages/py3/h/httpx/httpx-VERSION-py3-none-any.whl diff --git a/build/pkgs/idna/checksums.ini b/build/pkgs/idna/checksums.ini index 10e80a0fd10..ae983bf54b7 100644 --- a/build/pkgs/idna/checksums.ini +++ b/build/pkgs/idna/checksums.ini @@ -1,5 +1,6 @@ tarball=idna-VERSION-py3-none-any.whl sha1=352c6bd8ee12319953116397718c1a8ab6887259 +sha256=c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f md5=903a924c21b63a610a641a651f38d72f cksum=177777344 upstream_url=https://pypi.io/packages/py3/i/idna/idna-VERSION-py3-none-any.whl diff --git a/build/pkgs/igraph/checksums.ini b/build/pkgs/igraph/checksums.ini index 51192799072..802e094f33b 100644 --- a/build/pkgs/igraph/checksums.ini +++ b/build/pkgs/igraph/checksums.ini @@ -1,5 +1,6 @@ tarball=igraph-VERSION.tar.gz sha1=40efbd2adf3c1cc0a2bb3e14f4c7898d053f1fe4 +sha256=ac5fa94ae6fd1eace651e4b235e99c056479a5c5d0d641aed30240ac33b19403 md5=87d287445c44fdd19ad67a25e0e0859b cksum=2559618807 upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz diff --git a/build/pkgs/imagesize/checksums.ini b/build/pkgs/imagesize/checksums.ini index 3410cc38578..bd5cb019d59 100644 --- a/build/pkgs/imagesize/checksums.ini +++ b/build/pkgs/imagesize/checksums.ini @@ -1,5 +1,6 @@ tarball=imagesize-VERSION-py2.py3-none-any.whl sha1=6054e528ed40a9979df9952437a20c3e5773d972 +sha256=0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b md5=020f792680bad3d268a7321947e4e542 cksum=379545474 upstream_url=https://pypi.io/packages/py2.py3/i/imagesize/imagesize-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/iml/checksums.ini b/build/pkgs/iml/checksums.ini index 628d5461e70..1c3a3355bb7 100644 --- a/build/pkgs/iml/checksums.ini +++ b/build/pkgs/iml/checksums.ini @@ -1,4 +1,5 @@ tarball=iml-VERSION.tar.bz2 sha1=8aba468a62e6fb0584be9b014350b734663c0670 +sha256=220161bbe4b54b24fcffc6c9117c8c8c09f2f13a9e2351cc2ef0dbac33bd418a md5=a8083e70c0c4378f69eb772c1eeed6f0 cksum=2793221462 diff --git a/build/pkgs/importlib_metadata/checksums.ini b/build/pkgs/importlib_metadata/checksums.ini index 3f05bd40dcb..b4eebafdb45 100644 --- a/build/pkgs/importlib_metadata/checksums.ini +++ b/build/pkgs/importlib_metadata/checksums.ini @@ -1,5 +1,6 @@ tarball=importlib_metadata-VERSION-py3-none-any.whl sha1=82c9e2e6cfbb2d5a14558085efa65e75a95bd12f +sha256=4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e md5=6e7b1ecc1d63501048d17b2a59e74878 cksum=905912098 upstream_url=https://pypi.io/packages/py3/i/importlib_metadata/importlib_metadata-VERSION-py3-none-any.whl diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini index e733e142b52..da77e46d8e8 100644 --- a/build/pkgs/importlib_resources/checksums.ini +++ b/build/pkgs/importlib_resources/checksums.ini @@ -1,5 +1,6 @@ tarball=importlib_resources-VERSION-py3-none-any.whl sha1=5caa4e8a9ee93123a5c3badb6edbc009b5d8494a +sha256=e8bf90d8213b486f428c9c39714b920041cb02c184686a3dee24905aaa8105d6 md5=a4ba26d808eed58bde249276da04c9e1 cksum=2487282894 upstream_url=https://pypi.io/packages/py3/i/importlib_resources/importlib_resources-VERSION-py3-none-any.whl diff --git a/build/pkgs/info/checksums.ini b/build/pkgs/info/checksums.ini index cf6afe0684c..5aa961ad117 100644 --- a/build/pkgs/info/checksums.ini +++ b/build/pkgs/info/checksums.ini @@ -1,5 +1,6 @@ tarball=texinfo-VERSION.tar.xz sha1=356a623b88401d7c993408f33450c8104aad9df8 +sha256=74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf md5=37bf94fd255729a14d4ea3dda119f81a cksum=1448415744 upstream_url=https://ftp.gnu.org/gnu/texinfo/texinfo-VERSION.tar.xz diff --git a/build/pkgs/ipykernel/checksums.ini b/build/pkgs/ipykernel/checksums.ini index 1dc395313d6..eaf86f10940 100644 --- a/build/pkgs/ipykernel/checksums.ini +++ b/build/pkgs/ipykernel/checksums.ini @@ -1,5 +1,6 @@ tarball=ipykernel-VERSION.tar.gz sha1=3465b4aa523705e930f295b5c549924e376a02e2 +sha256=7d5d594b6690654b4d299edba5e872dc17bb7396a8d0609c97cb7b8a1c605de6 md5=f48666313b1ddf7b796b9a58805ba71b cksum=2919090600 upstream_url=https://pypi.io/packages/source/i/ipykernel/ipykernel-VERSION.tar.gz diff --git a/build/pkgs/ipympl/checksums.ini b/build/pkgs/ipympl/checksums.ini index 2c724147c64..d3de7193dff 100644 --- a/build/pkgs/ipympl/checksums.ini +++ b/build/pkgs/ipympl/checksums.ini @@ -1,5 +1,6 @@ tarball=ipympl-VERSION-py2.py3-none-any.whl sha1=9848409026669d9edd83074730d7e2456ae8a187 +sha256=d113cd55891bafe9b27ef99b6dd111a87beb6bb2ae550c404292272103be8013 md5=e08ec29d29955174178b7230d41a7ff7 cksum=490103438 upstream_url=https://pypi.io/packages/py2.py3/i/ipympl/ipympl-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/ipython/checksums.ini b/build/pkgs/ipython/checksums.ini index cf6feff95e3..1c9704c439b 100644 --- a/build/pkgs/ipython/checksums.ini +++ b/build/pkgs/ipython/checksums.ini @@ -1,5 +1,6 @@ tarball=ipython-VERSION.tar.gz sha1=4b5ab06a1b5e1a3285ac91d7dac9a22d18898a31 +sha256=ca6f079bb33457c66e233e4580ebfc4128855b4cf6370dddd73842a9563e8a27 md5=b56b71635168357dc94ac384b0a78f0c cksum=1043636334 upstream_url=https://pypi.io/packages/source/i/ipython/ipython-VERSION.tar.gz diff --git a/build/pkgs/ipython_genutils/checksums.ini b/build/pkgs/ipython_genutils/checksums.ini index 363c3428a98..c0ed181da0f 100644 --- a/build/pkgs/ipython_genutils/checksums.ini +++ b/build/pkgs/ipython_genutils/checksums.ini @@ -1,4 +1,5 @@ tarball=ipython_genutils-VERSION.tar.gz sha1=5bbf262704d1406ed63e639c5136bf80b87272c5 +sha256=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 md5=5a4f9781f78466da0ea1a648f3e1f79f cksum=2736651136 diff --git a/build/pkgs/ipywidgets/checksums.ini b/build/pkgs/ipywidgets/checksums.ini index a04080bb509..773389a7c14 100644 --- a/build/pkgs/ipywidgets/checksums.ini +++ b/build/pkgs/ipywidgets/checksums.ini @@ -1,5 +1,6 @@ tarball=ipywidgets-VERSION.tar.gz sha1=95f7ec13e8ce75e2da40c1789b4af291946a6d99 +sha256=40211efb556adec6fa450ccc2a77d59ca44a060f4f9f136833df59c9f538e6e8 md5=2809d1668037606caac588cab329bece cksum=1839869422 upstream_url=https://pypi.io/packages/source/i/ipywidgets/ipywidgets-VERSION.tar.gz diff --git a/build/pkgs/isl/checksums.ini b/build/pkgs/isl/checksums.ini index f9ce14a528a..9997d236887 100644 --- a/build/pkgs/isl/checksums.ini +++ b/build/pkgs/isl/checksums.ini @@ -1,4 +1,5 @@ tarball=isl-VERSION.tar.bz2 sha1=b1d96b7b44c72f86c98d4fbd4caaa7796b27681e +sha256=b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2 md5=cb396f31b24aeeac49840b519741b0e1 cksum=4190462468 diff --git a/build/pkgs/isoduration/checksums.ini b/build/pkgs/isoduration/checksums.ini index 490fd21be52..e1c3cc0e720 100644 --- a/build/pkgs/isoduration/checksums.ini +++ b/build/pkgs/isoduration/checksums.ini @@ -1,5 +1,6 @@ tarball=isoduration-VERSION-py3-none-any.whl sha1=a113878d368fee6881efcfd12421b12f8e6ae11c +sha256=b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042 md5=c5f76c264bf80cca84b99c48d8af5afb cksum=3373220361 upstream_url=https://pypi.io/packages/py3/i/isoduration/isoduration-VERSION-py3-none-any.whl diff --git a/build/pkgs/jedi/checksums.ini b/build/pkgs/jedi/checksums.ini index 291cf130faf..4966025cd53 100644 --- a/build/pkgs/jedi/checksums.ini +++ b/build/pkgs/jedi/checksums.ini @@ -1,5 +1,6 @@ tarball=jedi-VERSION.tar.gz sha1=07d1e04c24cecf1b7f38f8905ce81c006f76cc20 +sha256=cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd md5=0951191b506b660bfdb90c3dcd5b3254 cksum=8256815 upstream_url=https://pypi.io/packages/source/j/jedi/jedi-VERSION.tar.gz diff --git a/build/pkgs/jinja2/checksums.ini b/build/pkgs/jinja2/checksums.ini index 3d2a3484695..79fd7d26134 100644 --- a/build/pkgs/jinja2/checksums.ini +++ b/build/pkgs/jinja2/checksums.ini @@ -1,5 +1,6 @@ tarball=Jinja2-VERSION-py3-none-any.whl sha1=2a4d66fe16c565145c8bec1b22d57ab1e7028613 +sha256=7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa md5=bb730eed73dcd0bc2b04c71555f37d92 cksum=1024075345 upstream_url=https://pypi.io/packages/py3/j/jinja2/Jinja2-VERSION-py3-none-any.whl diff --git a/build/pkgs/jmol/checksums.ini b/build/pkgs/jmol/checksums.ini index 71b5b403ed1..09c0eae12a7 100644 --- a/build/pkgs/jmol/checksums.ini +++ b/build/pkgs/jmol/checksums.ini @@ -1,4 +1,5 @@ tarball=jmol-VERSION.tar.bz2 sha1=63aa528c1105733b1ad2cde222cf8c7ba7f456c4 +sha256=ebf9cd42cd8e3839cf94ec11691b98a9b00917f3485a821291b76d7ecd6ffe9d md5=99974970fe3c78e4401bf62780185fee cksum=3961597437 diff --git a/build/pkgs/json5/checksums.ini b/build/pkgs/json5/checksums.ini index 5e05994b435..1a693c48287 100644 --- a/build/pkgs/json5/checksums.ini +++ b/build/pkgs/json5/checksums.ini @@ -1,5 +1,6 @@ tarball=json5-VERSION-py2.py3-none-any.whl sha1=54bf91b9c2812e82ccd212cefca5bc5607a538b4 +sha256=740c7f1b9e584a468dbb2939d8d458db3427f2c93ae2139d05f47e453eae964f md5=aede9af2a42cc0cd928e4dc99e9a6a45 cksum=134804175 upstream_url=https://pypi.io/packages/py2.py3/j/json5/json5-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jsonpointer/checksums.ini b/build/pkgs/jsonpointer/checksums.ini index 67173595af5..1294f43332f 100644 --- a/build/pkgs/jsonpointer/checksums.ini +++ b/build/pkgs/jsonpointer/checksums.ini @@ -1,5 +1,6 @@ tarball=jsonpointer-VERSION-py2.py3-none-any.whl sha1=de1b07c2d014f5b8e672cf0fb1225b2232d0b414 +sha256=15d51bba20eea3165644553647711d150376234112651b4f1811022aecad7d7a md5=eb9dcb8c4ccf5d97cea88a7d13510032 cksum=1224177904 upstream_url=https://pypi.io/packages/py2.py3/j/jsonpointer/jsonpointer-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jsonschema/checksums.ini b/build/pkgs/jsonschema/checksums.ini index e2b4c0ecb27..f272e17e5e8 100644 --- a/build/pkgs/jsonschema/checksums.ini +++ b/build/pkgs/jsonschema/checksums.ini @@ -1,5 +1,6 @@ tarball=jsonschema-VERSION.tar.gz sha1=9f762c6c2b92defddf1c441cce8132d021252b2c +sha256=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d md5=7c65ceb8923c83cb1f22c2b5a86d99b0 cksum=2329321415 upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz diff --git a/build/pkgs/jsonschema_specifications/checksums.ini b/build/pkgs/jsonschema_specifications/checksums.ini index b0a51d9b7b4..bf3eff7dcca 100644 --- a/build/pkgs/jsonschema_specifications/checksums.ini +++ b/build/pkgs/jsonschema_specifications/checksums.ini @@ -1,5 +1,6 @@ tarball=jsonschema_specifications-VERSION-py3-none-any.whl sha1=4132bed31478bc96960099e58ae4c083c514c551 +sha256=764a2b9325c225208121948b15f2b2d16fddbe223fdfc096b45c70c1f7f7b8c1 md5=dbd17550f666e0f9aa74270d0d4e97a3 cksum=135654159 upstream_url=https://pypi.io/packages/py3/j/jsonschema_specifications/jsonschema_specifications-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupymake/checksums.ini b/build/pkgs/jupymake/checksums.ini index 9e697f2a1dc..b6c2e9bc6dc 100644 --- a/build/pkgs/jupymake/checksums.ini +++ b/build/pkgs/jupymake/checksums.ini @@ -1,4 +1,5 @@ tarball=JuPyMake-VERSION.tar.gz sha1=0dc4e4a29afbdc733908249cd28b7ed4c4ab8b73 +sha256=4c756cd6a6056a20cd71f7b5e463c79dad0257241bbd32a40b750882fafdb545 md5=646f0c6c91166ea84e233587fc2dec1e cksum=4049738923 diff --git a/build/pkgs/jupyter_client/checksums.ini b/build/pkgs/jupyter_client/checksums.ini index b91837ba332..74fc516ac89 100644 --- a/build/pkgs/jupyter_client/checksums.ini +++ b/build/pkgs/jupyter_client/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_client-VERSION-py3-none-any.whl sha1=341f822626b55b53f03a21a44d78dc203472406b +sha256=5eb9f55eb0650e81de6b7e34308d8b92d04fe4ec41cd8193a913979e33d8e1a5 md5=cca418dacc69d69f3e3c71704f1fd259 cksum=753481733 upstream_url=https://pypi.io/packages/py3/j/jupyter_client/jupyter_client-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_core/checksums.ini b/build/pkgs/jupyter_core/checksums.ini index 0c807beeff7..e0ae751e99d 100644 --- a/build/pkgs/jupyter_core/checksums.ini +++ b/build/pkgs/jupyter_core/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_core-VERSION.tar.gz sha1=0fe33e3247e595cdb83e2220f02c566ea9397e6a +sha256=0c28db6cbe2c37b5b398e1a1a5b22f84fd64cd10afc1f6c05b02fb09481ba45f md5=1d61b3c16f6781d8f44e1bd95cd8e73f cksum=523684111 upstream_url=https://pypi.io/packages/source/j/jupyter_core/jupyter_core-VERSION.tar.gz diff --git a/build/pkgs/jupyter_events/checksums.ini b/build/pkgs/jupyter_events/checksums.ini index b0721f150a1..6ca8548cffb 100644 --- a/build/pkgs/jupyter_events/checksums.ini +++ b/build/pkgs/jupyter_events/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_events-VERSION-py3-none-any.whl sha1=1b3fd8c003ea9e51b0f2d38daa89fded161767f7 +sha256=57a2749f87ba387cd1bfd9b22a0875b889237dbf2edc2121ebb22bde47036c17 md5=c29e5cb7f9f1b3916b2d9d416b470294 cksum=2851951719 upstream_url=https://pypi.io/packages/py3/j/jupyter_events/jupyter_events-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_jsmol/checksums.ini b/build/pkgs/jupyter_jsmol/checksums.ini index 9ac2c41a8e4..b27ffb72b5f 100644 --- a/build/pkgs/jupyter_jsmol/checksums.ini +++ b/build/pkgs/jupyter_jsmol/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_jsmol-VERSION-py2.py3-none-any.whl sha1=b00f1ca76aaa906c7c0a43e36baf608183f3d552 +sha256=dca3a232f98aa92739de8b7905765d22f325a2ba5d7a3a2f5b2374e88cc80471 md5=dd786877513296a36a08518ad64ace47 cksum=2135042898 upstream_url=https://pypi.io/packages/py2.py3/j/jupyter_jsmol/jupyter_jsmol-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jupyter_lsp/checksums.ini b/build/pkgs/jupyter_lsp/checksums.ini index 0e0a2cbf90e..9d4fd961cb1 100644 --- a/build/pkgs/jupyter_lsp/checksums.ini +++ b/build/pkgs/jupyter_lsp/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_lsp-VERSION-py3-none-any.whl sha1=0f7a63d99c5cf624315583099f00eafc4b996b59 +sha256=9e06b8b4f7dd50300b70dd1a78c0c3b0c3d8fa68e0f2d8a5d1fbab62072aca3f md5=9c17daaa4372bffca936c1b6977e713b cksum=1933820697 upstream_url=https://pypi.io/packages/py3/j/jupyter_lsp/jupyter_lsp-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_server/checksums.ini b/build/pkgs/jupyter_server/checksums.ini index e81f1110be3..a3e7a1d5ba3 100644 --- a/build/pkgs/jupyter_server/checksums.ini +++ b/build/pkgs/jupyter_server/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_server-VERSION-py3-none-any.whl sha1=a54aa7f6f1657a55cae9ecc4a6654b6e3ca5fb73 +sha256=8e4b90380b59d7a1e31086c4692231f2a2ea4cb269f5516e60aba72ce8317fc9 md5=b028711b35fa80f6c7b01a54bd70718a cksum=1159424906 upstream_url=https://pypi.io/packages/py3/j/jupyter_server/jupyter_server-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_server_terminals/checksums.ini b/build/pkgs/jupyter_server_terminals/checksums.ini index 99f9ede51e0..427453a63ad 100644 --- a/build/pkgs/jupyter_server_terminals/checksums.ini +++ b/build/pkgs/jupyter_server_terminals/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyter_server_terminals-VERSION-py3-none-any.whl sha1=fd1201e9f0064b2a5a05ed7346dfe52546f13b0b +sha256=75779164661cec02a8758a5311e18bb8eb70c4e86c6b699403100f1585a12a36 md5=6312ef2342aa944aaa59619249d7248b cksum=2312769383 upstream_url=https://pypi.io/packages/py3/j/jupyter_server_terminals/jupyter_server_terminals-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab/checksums.ini b/build/pkgs/jupyterlab/checksums.ini index f98b0077323..1c40f9b678b 100644 --- a/build/pkgs/jupyterlab/checksums.ini +++ b/build/pkgs/jupyterlab/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyterlab-VERSION-py3-none-any.whl sha1=4efdd879660e719fd49be6ec169272f32a16593e +sha256=67dbec7057c6ad46f08a3667a80bdb890df9453822c93b5ddfd5e8313a718ef9 md5=968a2b0458440a6b018ff2863a66e4af cksum=2309499829 upstream_url=https://pypi.io/packages/py3/j/jupyterlab/jupyterlab-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_mathjax2/checksums.ini b/build/pkgs/jupyterlab_mathjax2/checksums.ini index 6a428bd21dc..cc4722ddd28 100644 --- a/build/pkgs/jupyterlab_mathjax2/checksums.ini +++ b/build/pkgs/jupyterlab_mathjax2/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyterlab_mathjax2-VERSION-py3-none-any.whl sha1=4e2bb182594a6c4f5d4edfb4f6e33597f09de402 +sha256=c65c401ee5638e7cbf1223ba95aceed8b26a2a3e48fd1d585a10dd95b9327a8f md5=4172e36b068af6a3f36c26a3f1946dc9 cksum=387386440 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_mathjax2/jupyterlab_mathjax2-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_pygments/checksums.ini b/build/pkgs/jupyterlab_pygments/checksums.ini index 6f5af4d8afd..3a1f7c5a7d0 100644 --- a/build/pkgs/jupyterlab_pygments/checksums.ini +++ b/build/pkgs/jupyterlab_pygments/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyterlab_pygments-VERSION-py2.py3-none-any.whl sha1=601f547767fa867494ff0764891807904b8ebbd2 +sha256=2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f md5=44194b8e643cf025ec3a91f0c751c7d7 cksum=4169885263 upstream_url=https://pypi.io/packages/py2.py3/j/jupyterlab_pygments/jupyterlab_pygments-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jupyterlab_server/checksums.ini b/build/pkgs/jupyterlab_server/checksums.ini index 3bd8926fd7b..f7d600275bc 100644 --- a/build/pkgs/jupyterlab_server/checksums.ini +++ b/build/pkgs/jupyterlab_server/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyterlab_server-VERSION-py3-none-any.whl sha1=1fff8c8bc4c81b006cb83d4524dc8a6f3364e57c +sha256=5f077e142bb8dc9b843d960f940c513581bceca3793a0d80f9c67d9522c4e876 md5=795bbf343ae17b75a31a50ef574d4b77 cksum=696988100 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_server/jupyterlab_server-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_widgets/checksums.ini b/build/pkgs/jupyterlab_widgets/checksums.ini index 7da29e7849e..820b0ce5c07 100644 --- a/build/pkgs/jupyterlab_widgets/checksums.ini +++ b/build/pkgs/jupyterlab_widgets/checksums.ini @@ -1,5 +1,6 @@ tarball=jupyterlab_widgets-VERSION-py3-none-any.whl sha1=b10775bb3966af627bb44fbda4efb553b24a5b93 +sha256=3cf5bdf5b897bf3bccf1c11873aa4afd776d7430200f765e0686bd352487b58d md5=fc3c9f41000461dbdca2b965fcee37db cksum=441194289 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_widgets/jupyterlab_widgets-VERSION-py3-none-any.whl diff --git a/build/pkgs/kenzo/checksums.ini b/build/pkgs/kenzo/checksums.ini index 7fff82ca271..17974d1eb58 100644 --- a/build/pkgs/kenzo/checksums.ini +++ b/build/pkgs/kenzo/checksums.ini @@ -1,5 +1,6 @@ tarball=kenzo-VERSION.tar.gz -upstream_url=https://github.com/miguelmarco/kenzo/releases/download/VERSION/kenzo-VERSION.tar.gz sha1=76115aae9972090d5d51fee18592fc7a79461474 +sha256=2a23697611a37714433a9e273098d0b2dfe4fdcd83d98b9fc8d7a055c064ed6b md5=3a3d5350fb17304f03e614713e585ed4 cksum=2981306888 +upstream_url=https://github.com/miguelmarco/kenzo/releases/download/VERSION/kenzo-VERSION.tar.gz diff --git a/build/pkgs/kissat/checksums.ini b/build/pkgs/kissat/checksums.ini index 85929110253..58b7a9e9987 100644 --- a/build/pkgs/kissat/checksums.ini +++ b/build/pkgs/kissat/checksums.ini @@ -1,5 +1,6 @@ tarball=kissat-rel-VERSION.tar.gz sha1=49972324939761306ee50cfa3df93cd3cd530256 +sha256=e85c757179bf7d96d21d2d6e3f0a8f2337d416b0e13ae065a9a8d52e30048bd3 md5=1d0fa246c5451e3592910f2c9a5f3476 cksum=2570717921 upstream_url=https://github.com/arminbiere/kissat/archive/refs/tags/rel-VERSION.tar.gz diff --git a/build/pkgs/kiwisolver/checksums.ini b/build/pkgs/kiwisolver/checksums.ini index db7ec7448ef..4e6dc7652ad 100644 --- a/build/pkgs/kiwisolver/checksums.ini +++ b/build/pkgs/kiwisolver/checksums.ini @@ -1,5 +1,6 @@ tarball=kiwisolver-VERSION.tar.gz sha1=e5234bdcb7e7b620d47a00da076d50f2b63d8649 +sha256=e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec md5=20dea6992699d6be8a563995d7fe0309 cksum=1731645516 upstream_url=https://files.pythonhosted.org/packages/source/k/kiwisolver/kiwisolver-VERSION.tar.gz diff --git a/build/pkgs/latte_int/checksums.ini b/build/pkgs/latte_int/checksums.ini index 804020ed92d..d3922160f2e 100644 --- a/build/pkgs/latte_int/checksums.ini +++ b/build/pkgs/latte_int/checksums.ini @@ -1,5 +1,6 @@ tarball=latte-int-VERSION.tar.gz sha1=0ba017349b21a9fdb34b74d7e23d584aa562b8f7 +sha256=006c10ebe5d5bfdc9b159cba6264a4432861fe763ce05fe821624ab7d3fc2170 md5=aa062777c4879f566134d048ce4c87d6 cksum=3733141299 upstream_url=https://github.com/latte-int/latte/releases/download/version_1_7_6/latte-int-VERSION.tar.gz diff --git a/build/pkgs/lcalc/checksums.ini b/build/pkgs/lcalc/checksums.ini index f755f54b49e..f3da39a147c 100644 --- a/build/pkgs/lcalc/checksums.ini +++ b/build/pkgs/lcalc/checksums.ini @@ -1,5 +1,6 @@ tarball=lcalc-VERSION.tar.xz sha1=dacf9ab672136edc2af5fe9adb7b0ced1e63eeff +sha256=d780c385579cc6ee45fa27ccd2d3a3c4157fbb5ef8cd1b8951d1028bbc64c035 md5=c496e95ae07a58085e93b2b3c3348719 cksum=1694786 upstream_url=https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e192/lcalc-VERSION.tar.xz diff --git a/build/pkgs/libatomic_ops/checksums.ini b/build/pkgs/libatomic_ops/checksums.ini index 92ac5be4cd5..f38b430a77c 100644 --- a/build/pkgs/libatomic_ops/checksums.ini +++ b/build/pkgs/libatomic_ops/checksums.ini @@ -1,5 +1,6 @@ tarball=libatomic_ops-VERSION.tar.gz sha1=69223bbec025a0d57977feb861479f78a5e6c8d7 +sha256=15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31 md5=a7e51e8041c3e60c298c037b2789c3fa cksum=596151076 upstream_url=https://github.com/ivmai/libatomic_ops/releases/download/vVERSION/libatomic_ops-VERSION.tar.gz diff --git a/build/pkgs/libbraiding/checksums.ini b/build/pkgs/libbraiding/checksums.ini index 466c33c66a5..15d87cbf265 100644 --- a/build/pkgs/libbraiding/checksums.ini +++ b/build/pkgs/libbraiding/checksums.ini @@ -1,5 +1,6 @@ tarball=libbraiding-VERSION-actually-VERSION.tar.gz sha1=b7e13778784fe1e36e7c0cbd7a4c234a090cd1b2 +sha256=73087d1145ace719eafeda1db1c28b5fe1c981b7e784dc59f2b1d6fc4ff75f80 md5=0513967c81b783ea66336b7ad0562534 cksum=3619705925 upstream_url=https://github.com/miguelmarco/libbraiding/releases/download/VERSION/libbraiding-VERSION.tar.gz diff --git a/build/pkgs/libffi/checksums.ini b/build/pkgs/libffi/checksums.ini index fbcc6a81efd..3747afcbad8 100644 --- a/build/pkgs/libffi/checksums.ini +++ b/build/pkgs/libffi/checksums.ini @@ -1,4 +1,5 @@ tarball=libffi-VERSION.tar.gz sha1=280c265b789e041c02e5c97815793dfc283fb1e6 +sha256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 md5=83b89587607e3eb65c70d361f13bab43 cksum=691100768 diff --git a/build/pkgs/libgd/checksums.ini b/build/pkgs/libgd/checksums.ini index 504b0d2d5be..3a9bfaec6ea 100644 --- a/build/pkgs/libgd/checksums.ini +++ b/build/pkgs/libgd/checksums.ini @@ -1,5 +1,6 @@ tarball=libgd-VERSION.tar.xz sha1=7ce6ecb5aed26c08246a37b6351c886ab4b51ca2 +sha256=3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61 md5=7a58b54d375eda236414201252a0ee3c cksum=1360697583 upstream_url=https://github.com/libgd/libgd/releases/download/gd-VERSION/libgd-VERSION.tar.xz diff --git a/build/pkgs/libhomfly/checksums.ini b/build/pkgs/libhomfly/checksums.ini index 0d3a841d93c..da1bcf4582c 100644 --- a/build/pkgs/libhomfly/checksums.ini +++ b/build/pkgs/libhomfly/checksums.ini @@ -1,5 +1,6 @@ tarball=libhomfly-VERSION.tar.gz sha1=a8a4d9fb5bfacdbacab32bb0c8ea6d21ad9f7e54 +sha256=f990d991d29a590c54b09eff68bc209c4cf2b8b12d945351688d2db8a0d30979 md5=1bb639fd4182be7ac9dbec0c3e631ce2 cksum=920200221 upstream_url=https://github.com/miguelmarco/libhomfly/releases/download/VERSION/libhomfly-VERSION.tar.gz diff --git a/build/pkgs/libogg/checksums.ini b/build/pkgs/libogg/checksums.ini index 0307fec2b99..10ad75791b1 100644 --- a/build/pkgs/libogg/checksums.ini +++ b/build/pkgs/libogg/checksums.ini @@ -1,4 +1,5 @@ tarball=libogg-VERSION.tar.gz sha1=270685c2a3d9dc6c98372627af99868aa4b4db53 +sha256=4e343f07aa5a1de8e0fa1107042d472186b3470d846b20b115b964eba5bae554 md5=ba526cd8f4403a5d351a9efaa8608fbc cksum=1193714825 diff --git a/build/pkgs/libpng/checksums.ini b/build/pkgs/libpng/checksums.ini index c6c7adab90b..239950867a1 100644 --- a/build/pkgs/libpng/checksums.ini +++ b/build/pkgs/libpng/checksums.ini @@ -1,4 +1,5 @@ tarball=libpng-VERSION.tar.gz sha1=012c842e6454dc38c6390623ed31ec4005c00584 +sha256=e30bf36cd5882e017c23a5c6a79a9aa1a744dd5841bb45ff7035ec6e3b3096b8 md5=68553080685f812d1dd7a6b8215c37d8 cksum=1294784956 diff --git a/build/pkgs/libsemigroups/checksums.ini b/build/pkgs/libsemigroups/checksums.ini index 4e13a36cb35..7d367b23559 100644 --- a/build/pkgs/libsemigroups/checksums.ini +++ b/build/pkgs/libsemigroups/checksums.ini @@ -1,5 +1,6 @@ tarball=libsemigroups-VERSION.tar.gz sha1=86375824b47ce4b0e23570122e873f67136d0c0a +sha256=6214fd9e87af3834ff5eb6377cde1cbef76c74b233e1b0c4d15af1d2311692b4 md5=ff79ad5fbc8bfeb64d48faaf24106b98 cksum=2845045455 upstream_url=https://github.com/libsemigroups/libsemigroups/releases/download/vVERSION/libsemigroups-VERSION.tar.gz diff --git a/build/pkgs/libtheora/checksums.ini b/build/pkgs/libtheora/checksums.ini index f18d6c544c5..53a8d68ad6a 100644 --- a/build/pkgs/libtheora/checksums.ini +++ b/build/pkgs/libtheora/checksums.ini @@ -1,4 +1,5 @@ tarball=libtheora-VERSION.tar.bz2 sha1=8dcaa8e61cd86eb1244467c0b64b9ddac04ae262 +sha256=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc md5=292ab65cedd5021d6b7ddd117e07cd8e cksum=480505883 diff --git a/build/pkgs/lidia/checksums.ini b/build/pkgs/lidia/checksums.ini index a72a61954a1..c33d08f5fa9 100644 --- a/build/pkgs/lidia/checksums.ini +++ b/build/pkgs/lidia/checksums.ini @@ -1,4 +1,5 @@ tarball=lidia-VERSION.tar.gz sha1=93da2f24e3caa4c10452b4f088382084da3ddfbd +sha256=a5a07e65fc48c9230e9669e4d968b4ede2cac234a49d0c8c93b85040d0d79c41 md5=2d75b417194e98be64dd85368e149cf4 cksum=1175913571 diff --git a/build/pkgs/lie/checksums.ini b/build/pkgs/lie/checksums.ini index 83fede0fa5f..5cf792516a5 100644 --- a/build/pkgs/lie/checksums.ini +++ b/build/pkgs/lie/checksums.ini @@ -1,4 +1,5 @@ tarball=lie-VERSION.tar.gz sha1=bf8d2303c02738cfd2c899332d736b5364322a5d +sha256=c4d6f67fa17d2bc77c875a5b2ad2b42ffc5cadf30e7d1c64c097648ccb918b1e md5=2e98f252364d43557a322ea7eb677944 cksum=3838739617 diff --git a/build/pkgs/linbox/checksums.ini b/build/pkgs/linbox/checksums.ini index 23f1a33a68f..38208010e47 100644 --- a/build/pkgs/linbox/checksums.ini +++ b/build/pkgs/linbox/checksums.ini @@ -1,4 +1,5 @@ tarball=linbox-VERSION.tar.gz sha1=9268e21b5aecbbfc45204b25195b786f80b769bc +sha256=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057 md5=1e90e300c7a324a7b6cece7c605b7a4e cksum=1921179523 diff --git a/build/pkgs/lrcalc/checksums.ini b/build/pkgs/lrcalc/checksums.ini index 8b8620ba521..6b9bef02f33 100644 --- a/build/pkgs/lrcalc/checksums.ini +++ b/build/pkgs/lrcalc/checksums.ini @@ -1,5 +1,6 @@ tarball=liblrcalc-VERSION.tar.gz sha1=2a98661eb39c7ef526c932f7886fc3142fd639ab +sha256=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57 md5=7cfa8f67287f2b70a15a833b94bc24b6 cksum=2250996027 upstream_url=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-VERSION.tar.gz diff --git a/build/pkgs/lrcalc_python/checksums.ini b/build/pkgs/lrcalc_python/checksums.ini index bdfef8711e6..91302f16f6d 100644 --- a/build/pkgs/lrcalc_python/checksums.ini +++ b/build/pkgs/lrcalc_python/checksums.ini @@ -1,5 +1,6 @@ tarball=lrcalc-VERSION.tar.gz sha1=3e9366d9e8b8beccec70b07d174b8f6683c01574 +sha256=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9 md5=4ae444d12ed8e0dd770594ea3ef4a208 cksum=2741305196 upstream_url=https://pypi.io/packages/source/l/lrcalc/lrcalc-VERSION.tar.gz diff --git a/build/pkgs/lrslib/checksums.ini b/build/pkgs/lrslib/checksums.ini index e296ecf4a74..14b58331d5a 100644 --- a/build/pkgs/lrslib/checksums.ini +++ b/build/pkgs/lrslib/checksums.ini @@ -1,5 +1,6 @@ tarball=lrslib-VERSION.tar.gz sha1=4723f2b96e4b59d8366316b84214d6221b7ee7ce +sha256=a202f3fb24a2e8561786dff679c7603c04c66d24728ad8aaba0b40dbdf9fb6a8 md5=b379d2bdef0f5200c6274d9c50361b7c cksum=1216904185 upstream_url=https://github.com/mkoeppe/lrslib/releases/download/lrslib-VERSION/lrslib-VERSION.tar.gz diff --git a/build/pkgs/m4ri/checksums.ini b/build/pkgs/m4ri/checksums.ini index f7a8318e9dd..0961df29ae4 100644 --- a/build/pkgs/m4ri/checksums.ini +++ b/build/pkgs/m4ri/checksums.ini @@ -1,4 +1,5 @@ tarball=m4ri-VERSION.tar.gz sha1=7d0d680f1e983c1d5b24e49f25194e2f327690b4 +sha256=a2ba0d74ec5129c6fab59cd7d8e7a9f00a69ec63b76672105faef524f9d88556 md5=3fb6a27437bf535128d605fe47c8fae8 cksum=1002661464 diff --git a/build/pkgs/m4rie/checksums.ini b/build/pkgs/m4rie/checksums.ini index 6c4abb19145..b2f56262594 100644 --- a/build/pkgs/m4rie/checksums.ini +++ b/build/pkgs/m4rie/checksums.ini @@ -1,4 +1,5 @@ tarball=m4rie-VERSION.tar.gz sha1=728524509dd30da2dc960814b61d0bae67f83043 +sha256=aea462e8c9b4c0303c0a064bd7ead52fe81214e59a7fc694f350161cad4f2c85 md5=e7685c63e7bab4c5a0922a161499ba83 cksum=127676695 diff --git a/build/pkgs/markupsafe/checksums.ini b/build/pkgs/markupsafe/checksums.ini index 0a124ae8e91..7e69552212f 100644 --- a/build/pkgs/markupsafe/checksums.ini +++ b/build/pkgs/markupsafe/checksums.ini @@ -1,5 +1,6 @@ tarball=MarkupSafe-VERSION.tar.gz sha1=ffca1ac960cedaf0cb419b5c97b64aab12220d04 +sha256=3aae9af4cac263007fd6309c64c6ab4506dd2b79382d9d19a1994f9240b8db4f md5=8138329a11cf4bd0f9db780b2af26c66 cksum=379626437 upstream_url=https://pypi.io/packages/source/m/markupsafe/MarkupSafe-VERSION.tar.gz diff --git a/build/pkgs/mathics/checksums.ini b/build/pkgs/mathics/checksums.ini index eeb1b4462f8..86972d7ccd7 100644 --- a/build/pkgs/mathics/checksums.ini +++ b/build/pkgs/mathics/checksums.ini @@ -1,5 +1,6 @@ tarball=Mathics3-VERSION.tar.gz sha1=a72550d3df97dd4055cf903a9f012683ca2adf35 +sha256=d50ee5ad07db845609078c99af789253337a45f50bef6f8b09262f48dca8da7c md5=f221aaf0ef9a27e2953429a32fe94652 cksum=658740029 upstream_url=https://pypi.io/packages/source/M/Mathics3/Mathics3-VERSION.tar.gz diff --git a/build/pkgs/mathics_scanner/checksums.ini b/build/pkgs/mathics_scanner/checksums.ini index 46b8d9ed821..bc47ea48118 100644 --- a/build/pkgs/mathics_scanner/checksums.ini +++ b/build/pkgs/mathics_scanner/checksums.ini @@ -1,5 +1,6 @@ tarball=Mathics_Scanner-VERSION.tar.gz sha1=c89bb997c1da04c1cfe945d16be96bdb0c6ae9a8 +sha256=7b05939751aacea42f3fc4e7eb1ab111f9fe32bae827e89f46a50e04907b19ef md5=5c1aabb415729617d8ebe03470f92339 cksum=1258714825 upstream_url=https://pypi.io/packages/source/m/mathics_scanner/Mathics_Scanner-VERSION.tar.gz diff --git a/build/pkgs/mathjax/checksums.ini b/build/pkgs/mathjax/checksums.ini index 6a6b233b2ae..24d5ac573d2 100644 --- a/build/pkgs/mathjax/checksums.ini +++ b/build/pkgs/mathjax/checksums.ini @@ -1,4 +1,5 @@ tarball=mathjax-VERSION.tar.gz sha1=3f7abecf8cacd7f5d7f9ae6c3baca7739101c17d +sha256=9b2ed180ff2ddb8d4ea1d00e4d14791320c35496f57073514a129c0c67f7625b md5=ba1a65ab58aaad6c84f39735c619bc34 cksum=1142131398 diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index 6be6d882f3b..b00100ba3a2 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,5 +1,6 @@ tarball=matplotlib-VERSION.tar.gz sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c +sha256=df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69 md5=2c70bea4dea84c090a7ecc8e0bb0748f cksum=1228885956 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz diff --git a/build/pkgs/matplotlib_inline/checksums.ini b/build/pkgs/matplotlib_inline/checksums.ini index 73d1d152d74..66307fea992 100644 --- a/build/pkgs/matplotlib_inline/checksums.ini +++ b/build/pkgs/matplotlib_inline/checksums.ini @@ -1,5 +1,6 @@ tarball=matplotlib-inline-VERSION.tar.gz sha1=a09347e3f2eaa6f9453c773132bf4bd9d38e2163 +sha256=f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304 md5=aded9a57e2f526f76b3a4851d5528d4f cksum=3152771377 upstream_url=https://pypi.io/packages/source/m/matplotlib_inline/matplotlib-inline-VERSION.tar.gz diff --git a/build/pkgs/matroid_database/checksums.ini b/build/pkgs/matroid_database/checksums.ini index 377ec62176e..1de2b8288ba 100644 --- a/build/pkgs/matroid_database/checksums.ini +++ b/build/pkgs/matroid_database/checksums.ini @@ -1,5 +1,6 @@ tarball=matroid_database-VERSION-py3-none-any.whl sha1=5879d6ca685f27df69134f56c07af50f9a2e6622 +sha256=c82e58ee8fec8d94263b981c4397bb0df8f489cdfbd37b399ea5a01b9c12c099 md5=e5d667282b7926a2fd268d14f9414214 cksum=1875993705 upstream_url=https://pypi.io/packages/py3/m/matroid_database/matroid_database-VERSION-py3-none-any.whl diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini index 0f594389fe6..71fd8be84aa 100644 --- a/build/pkgs/maxima/checksums.ini +++ b/build/pkgs/maxima/checksums.ini @@ -1,5 +1,6 @@ tarball=maxima-VERSION.tar.gz sha1=1010594e6d6082bbd8efaac1b7756ec1721a4ed5 +sha256=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07 md5=3c01f1daa6936e11d8713fef7751d3fe cksum=2420393096 upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download diff --git a/build/pkgs/mcqd/checksums.ini b/build/pkgs/mcqd/checksums.ini index 631b2445e05..a0dae947db5 100644 --- a/build/pkgs/mcqd/checksums.ini +++ b/build/pkgs/mcqd/checksums.ini @@ -1,4 +1,5 @@ tarball=mcqd-VERSION.tar.bz2 sha1=9c55da46815aa3903f0be2d1ffbdff9c17d4aa31 +sha256=54d378f51833f046bbceba2186d52c08026a295d0dfb74d2319e0ec7e3618f58 md5=831538634b7b7efe15b5e5ad3d9c59c2 cksum=2853560422 diff --git a/build/pkgs/meataxe/checksums.ini b/build/pkgs/meataxe/checksums.ini index ada4cb16f11..3caed4195c2 100644 --- a/build/pkgs/meataxe/checksums.ini +++ b/build/pkgs/meataxe/checksums.ini @@ -1,5 +1,6 @@ tarball=shared_meataxe-VERSION.tar.bz2 sha1=6764f72fab8b4472660cff6605087356ab91d3b7 +sha256=b8c5ff558712b266eef76a4ebc7a06e98cdef04cc46c542a1a725e318365969d md5=c9af9efa686e120612455778d64a71ca cksum=1648865875 upstream_url=https://github.com/simon-king-jena/SharedMeatAxe/releases/download/vVERSION/shared_meataxe-VERSION.tar.bz2 diff --git a/build/pkgs/meson/checksums.ini b/build/pkgs/meson/checksums.ini index 0d4a8f89a48..0cc13d09d55 100644 --- a/build/pkgs/meson/checksums.ini +++ b/build/pkgs/meson/checksums.ini @@ -1,5 +1,6 @@ tarball=meson-VERSION-py3-none-any.whl sha1=baf5b9bc9ca97f18c7dc87cfaf0e1dc4d617a4cf +sha256=d5223ecca9564d735d36daaba2571abc6c032c8c3a7ffa0674e803ef0c7e0219 md5=d418e644c04e55872ce3d7b6de007dbe cksum=559088366 upstream_url=https://pypi.io/packages/py3/m/meson/meson-VERSION-py3-none-any.whl diff --git a/build/pkgs/meson_python/checksums.ini b/build/pkgs/meson_python/checksums.ini index 1561ae04424..94babc2deb2 100644 --- a/build/pkgs/meson_python/checksums.ini +++ b/build/pkgs/meson_python/checksums.ini @@ -1,5 +1,6 @@ tarball=meson_python-VERSION.tar.gz sha1=71bf382c2f2e76aada2f511a84bd59a99a6b1238 +sha256=fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f md5=e91eb9946d7bb8be06e434c5a2dadd05 cksum=535820777 upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz diff --git a/build/pkgs/mistune/checksums.ini b/build/pkgs/mistune/checksums.ini index b8b60db1d7b..f280961eb16 100644 --- a/build/pkgs/mistune/checksums.ini +++ b/build/pkgs/mistune/checksums.ini @@ -1,5 +1,6 @@ tarball=mistune-VERSION.tar.gz sha1=c15d02c98d04a3e615c3c1932d1b9a3b1759067a +sha256=9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808 md5=a4437edb22cf6519a7c61730fecb1a3f cksum=2925260381 upstream_url=https://pypi.io/packages/source/m/mistune/mistune-VERSION.tar.gz diff --git a/build/pkgs/modular_decomposition/checksums.ini b/build/pkgs/modular_decomposition/checksums.ini index 2c97fe5389a..bc288889dc7 100644 --- a/build/pkgs/modular_decomposition/checksums.ini +++ b/build/pkgs/modular_decomposition/checksums.ini @@ -1,4 +1,5 @@ tarball=modular_decomposition-VERSION.tar.bz2 sha1=b0ce6d839d1cd2e93d806e70b13bc40bcdbaf9e9 +sha256=cf2a950c5d2b320770afb0cda195e5df46a24c4fd5056906ca9502260b33446b md5=9bc5245c5fab9df4f45c8e10c27cf3b8 cksum=2034006428 diff --git a/build/pkgs/modular_resolution/checksums.ini b/build/pkgs/modular_resolution/checksums.ini index 5d1d465cead..54254d45fc5 100644 --- a/build/pkgs/modular_resolution/checksums.ini +++ b/build/pkgs/modular_resolution/checksums.ini @@ -1,5 +1,6 @@ tarball=modular_resolution-VERSION.tar.gz sha1=09ee61b1f9a33fb3e9bf0b658f81d3ede5748328 +sha256=87b36c8c6ecc5dfe7a2594ce3ea35bb937d3b1a566860ddc138cac33dffc4490 md5=0e59e69a46014b8935c5e081d3bfc57a cksum=2981185519 upstream_url=https://github.com/sagemath/modular_resolution/releases/download/VERSION/modular_resolution-VERSION.tar.gz diff --git a/build/pkgs/mpc/checksums.ini b/build/pkgs/mpc/checksums.ini index 8a8cefd6b0c..43c148cd976 100644 --- a/build/pkgs/mpc/checksums.ini +++ b/build/pkgs/mpc/checksums.ini @@ -1,5 +1,6 @@ tarball=mpc-VERSION.tar.gz sha1=bac1c1fa79f5602df1e29e4684e103ad55714e02 +sha256=ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 md5=5c9bc658c9fd0f940e8e3e0f09530c62 cksum=3202795598 upstream_url=https://ftp.gnu.org/gnu/mpc/mpc-VERSION.tar.gz diff --git a/build/pkgs/mpfi/checksums.ini b/build/pkgs/mpfi/checksums.ini index 6d6940e0237..c8aa0690ed6 100644 --- a/build/pkgs/mpfi/checksums.ini +++ b/build/pkgs/mpfi/checksums.ini @@ -1,4 +1,5 @@ tarball=mpfi-VERSION.tar.bz2 sha1=6a44e59f69fa72b4fe1c67b9c9ccf678f321ef80 +sha256=c04f52cb306824b91b6d6eacf4f675b91fdee47c30f14d5b346dbfcd2492d274 md5=1c233f3646bfb8a363aee0cc653c8baa cksum=4291278873 diff --git a/build/pkgs/mpfr/checksums.ini b/build/pkgs/mpfr/checksums.ini index 766356c1fd4..f3c5070dd31 100644 --- a/build/pkgs/mpfr/checksums.ini +++ b/build/pkgs/mpfr/checksums.ini @@ -1,5 +1,6 @@ tarball=mpfr-VERSION.tar.bz2 sha1=f9dbe49b092e4c8e0a039e6d46c059696cc2f51c +sha256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0 md5=7765afa036e4ce7fb0e02bce0fef894b cksum=1526077734 upstream_url=https://www.mpfr.org/mpfr-current/mpfr-VERSION.tar.bz2 diff --git a/build/pkgs/mpfrcx/checksums.ini b/build/pkgs/mpfrcx/checksums.ini index 7f1ac08b4e6..d7b842075ba 100644 --- a/build/pkgs/mpfrcx/checksums.ini +++ b/build/pkgs/mpfrcx/checksums.ini @@ -1,5 +1,6 @@ tarball=mpfrcx-VERSION.tar.gz sha1=460bc7cb48fae4f8070b73912080fdf0c08c93b6 +sha256=9da9b3614c0a3e00e6ed2b82fc935d1c838d97074dc59cb388f8fafbe3db8594 md5=45077ba92dccc25488086962d160de6c cksum=1142118879 upstream_url=https://www.multiprecision.org/downloads/mpfrcx-VERSION.tar.gz diff --git a/build/pkgs/mpmath/checksums.ini b/build/pkgs/mpmath/checksums.ini index 08d6d38673d..73aa8267990 100644 --- a/build/pkgs/mpmath/checksums.ini +++ b/build/pkgs/mpmath/checksums.ini @@ -1,5 +1,6 @@ tarball=mpmath-VERSION.tar.gz sha1=b7c00f35eb35978197c8f5afc11a8b4b994dd382 +sha256=7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f md5=d5d17bbefea73eeb959967351d905306 cksum=1852385672 upstream_url=https://files.pythonhosted.org/packages/source/m/mpmath/mpmath-VERSION.tar.gz diff --git a/build/pkgs/nauty/checksums.ini b/build/pkgs/nauty/checksums.ini index f699a05e9fc..4be1d99bdfe 100644 --- a/build/pkgs/nauty/checksums.ini +++ b/build/pkgs/nauty/checksums.ini @@ -1,5 +1,6 @@ tarball=nauty${VERSION}.tar.gz sha1=672e9fc9dfd07201af37ee65807a9b493331ed92 +sha256=159d2156810a6bb240410cd61eb641add85088d9f15c888cdaa37b8681f929ce md5=16c6edc1a8747c9281041b7c7092135f cksum=2663136901 upstream_url=https://pallini.di.uniroma1.it/nauty${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}.tar.gz diff --git a/build/pkgs/nbclient/checksums.ini b/build/pkgs/nbclient/checksums.ini index a5f4616ad8b..40061482cbf 100644 --- a/build/pkgs/nbclient/checksums.ini +++ b/build/pkgs/nbclient/checksums.ini @@ -1,5 +1,6 @@ tarball=nbclient-VERSION-py3-none-any.whl sha1=fcb4ad9b3ea1bea4d305076c0a7640a483bd11f3 +sha256=25e861299e5303a0477568557c4045eccc7a34c17fc08e7959558707b9ebe548 md5=db61a38c8b66b5b9c7f6f0c7c7de8f26 cksum=2793018181 upstream_url=https://pypi.io/packages/py3/n/nbclient/nbclient-VERSION-py3-none-any.whl diff --git a/build/pkgs/nbconvert/checksums.ini b/build/pkgs/nbconvert/checksums.ini index 20eb0e3e2df..89e92025bac 100644 --- a/build/pkgs/nbconvert/checksums.ini +++ b/build/pkgs/nbconvert/checksums.ini @@ -1,5 +1,6 @@ tarball=nbconvert-VERSION-py3-none-any.whl sha1=5317fa68bbd7f66fc3fcc5b0e6b0d6e2df967ba0 +sha256=39fe4b8bdd1b0104fdd86fc8a43a9077ba64c720bda4c6132690d917a0a154ee md5=ad534f2db53d8677b790be0e98992f8e cksum=2885634129 upstream_url=https://pypi.io/packages/py3/n/nbconvert/nbconvert-VERSION-py3-none-any.whl diff --git a/build/pkgs/nbformat/checksums.ini b/build/pkgs/nbformat/checksums.ini index 81f66428e25..f9652f065b0 100644 --- a/build/pkgs/nbformat/checksums.ini +++ b/build/pkgs/nbformat/checksums.ini @@ -1,5 +1,6 @@ tarball=nbformat-VERSION-py3-none-any.whl sha1=e38af74817e9d81101583363d9ffe349f0038eb9 +sha256=1c5172d786a41b82bcfd0c23f9e6b6f072e8fb49c39250219e4acfff1efe89e9 md5=0821545beba702b7001ad5bd744c89ba cksum=2633499795 upstream_url=https://pypi.io/packages/py3/n/nbformat/nbformat-VERSION-py3-none-any.whl diff --git a/build/pkgs/ncurses/checksums.ini b/build/pkgs/ncurses/checksums.ini index f67d0e23402..71ccb5a6d1e 100644 --- a/build/pkgs/ncurses/checksums.ini +++ b/build/pkgs/ncurses/checksums.ini @@ -1,5 +1,6 @@ tarball=ncurses-VERSION.tar.gz sha1=38fb1462d13b04bb900adf07918725c4b7ed0682 +sha256=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 md5=a2736befde5fee7d2b7eb45eb281cdbe cksum=981463359 upstream_url=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-VERSION.tar.gz diff --git a/build/pkgs/nest_asyncio/checksums.ini b/build/pkgs/nest_asyncio/checksums.ini index 9752b8da3bb..b27ded6de0f 100644 --- a/build/pkgs/nest_asyncio/checksums.ini +++ b/build/pkgs/nest_asyncio/checksums.ini @@ -1,5 +1,6 @@ tarball=nest_asyncio-VERSION.tar.gz sha1=e7d8036f6558011c5ae0c649e0af21eb530044d3 +sha256=25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb md5=9f0fe9ca229b1eef6e1ffba266413616 cksum=3560927178 upstream_url=https://pypi.io/packages/source/n/nest_asyncio/nest_asyncio-VERSION.tar.gz diff --git a/build/pkgs/networkx/checksums.ini b/build/pkgs/networkx/checksums.ini index 6daf026581b..9d70be95af7 100644 --- a/build/pkgs/networkx/checksums.ini +++ b/build/pkgs/networkx/checksums.ini @@ -1,5 +1,6 @@ tarball=networkx-VERSION.tar.gz sha1=b12cf95ed8bc3fe568e3c8e023473a3767c43f8d +sha256=9f1bb5cf3409bf324e0a722c20bdb4c20ee39bf1c30ce8ae499c8502b0b5e0c6 md5=e81583dcb3d929b60660721912f3faed cksum=2601544693 upstream_url=https://pypi.io/packages/source/n/networkx/networkx-VERSION.tar.gz diff --git a/build/pkgs/ninja_build/checksums.ini b/build/pkgs/ninja_build/checksums.ini index 43ddbfd6334..414d4af563d 100644 --- a/build/pkgs/ninja_build/checksums.ini +++ b/build/pkgs/ninja_build/checksums.ini @@ -1,5 +1,6 @@ tarball=ninja_build-VERSION.tar.gz sha1=938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3 +sha256=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea md5=32151c08211d7ca3c1d832064f6939b0 cksum=4040304461 upstream_url=https://github.com/ninja-build/ninja/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/normaliz/checksums.ini b/build/pkgs/normaliz/checksums.ini index fd5561cad24..1c6ae086e54 100644 --- a/build/pkgs/normaliz/checksums.ini +++ b/build/pkgs/normaliz/checksums.ini @@ -1,5 +1,6 @@ tarball=normaliz-VERSION.tar.gz sha1=d3c4e554c6a5ccf4fd04147e7744a63e3def1766 +sha256=365e1d1e2a338dc4df1947a440e606bb66dd261307e617905e8eca64eaafcf6e md5=1c7a7833ad180ef4e0e4f124ed398973 cksum=3124231015 upstream_url=https://github.com/Normaliz/Normaliz/releases/download/vVERSION/normaliz-VERSION.tar.gz diff --git a/build/pkgs/notebook/checksums.ini b/build/pkgs/notebook/checksums.ini index 1fe102fa1f0..af5d1c53219 100644 --- a/build/pkgs/notebook/checksums.ini +++ b/build/pkgs/notebook/checksums.ini @@ -1,5 +1,6 @@ tarball=notebook-VERSION-py3-none-any.whl sha1=90ec65091058ac541a55cc2417de83c1bcb24985 +sha256=197d8e0595acabf4005851c8716e952a81b405f7aefb648067a761fbde267ce7 md5=bf0fe0b56048113cd8a9e2df7add9fe9 cksum=1004716816 upstream_url=https://pypi.io/packages/py3/n/notebook/notebook-VERSION-py3-none-any.whl diff --git a/build/pkgs/notebook_shim/checksums.ini b/build/pkgs/notebook_shim/checksums.ini index c646e5c3ae9..8ed750568bd 100644 --- a/build/pkgs/notebook_shim/checksums.ini +++ b/build/pkgs/notebook_shim/checksums.ini @@ -1,5 +1,6 @@ tarball=notebook_shim-VERSION-py3-none-any.whl sha1=9bb3dce360ce69aec99f873d8e80c1e9fdf92fde +sha256=a83496a43341c1674b093bfcebf0fe8e74cbe7eda5fd2bbc56f8e39e1486c0c7 md5=f2207bef3d00f9b2dc14b0eeec63460d cksum=2703250856 upstream_url=https://pypi.io/packages/py3/n/notebook_shim/notebook_shim-VERSION-py3-none-any.whl diff --git a/build/pkgs/notedown/checksums.ini b/build/pkgs/notedown/checksums.ini index 7ea822115b8..3cab5e2bc68 100644 --- a/build/pkgs/notedown/checksums.ini +++ b/build/pkgs/notedown/checksums.ini @@ -1,4 +1,5 @@ tarball=notedown-VERSION.tar.gz sha1=9af1839933b4978fba9d2290c2fe39a5de2d02fe +sha256=36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee md5=00d72f37e8a64d7f4c66ea8e0d214236 cksum=2709668480 diff --git a/build/pkgs/ntl/checksums.ini b/build/pkgs/ntl/checksums.ini index 57769694456..6f6698bc2b1 100644 --- a/build/pkgs/ntl/checksums.ini +++ b/build/pkgs/ntl/checksums.ini @@ -1,5 +1,6 @@ tarball=ntl-VERSION.tar.gz sha1=a55050ca07fb42c6f9e9a479b6f80be6f1f77886 +sha256=210d06c31306cbc6eaf6814453c56c776d9d8e8df36d74eb306f6a523d1c6a8a md5=abd887865df30c02609210a86cb953b1 cksum=322384454 upstream_url=https://src.fedoraproject.org/repo/pkgs/ntl/ntl-11.5.1.tar.gz/sha512/cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f/ntl-11.5.1.tar.gz diff --git a/build/pkgs/numpy/checksums.ini b/build/pkgs/numpy/checksums.ini index f53c6020879..10865a00c4d 100644 --- a/build/pkgs/numpy/checksums.ini +++ b/build/pkgs/numpy/checksums.ini @@ -1,5 +1,6 @@ tarball=numpy-VERSION.tar.gz sha1=915414f1efabd7c183583154cf1a709bd2745828 +sha256=697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4 md5=1c915dc6c36dd4c674d9379e9470ff8b cksum=161965903 upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.tar.gz diff --git a/build/pkgs/openblas/checksums.ini b/build/pkgs/openblas/checksums.ini index 5527989eebf..7e00848d23a 100644 --- a/build/pkgs/openblas/checksums.ini +++ b/build/pkgs/openblas/checksums.ini @@ -1,5 +1,6 @@ tarball=openblas-VERSION.tar.gz sha1=af6dce0e486e684be842053fcbd98eaf97e39749 +sha256=4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 md5=bd496a1c81769ed19a161c1f8f904ccd cksum=1399957963 upstream_url=https://github.com/xianyi/OpenBLAS/archive/vVERSION.tar.gz diff --git a/build/pkgs/openssl/checksums.ini b/build/pkgs/openssl/checksums.ini index 9a4767ed76c..16421b3fe12 100644 --- a/build/pkgs/openssl/checksums.ini +++ b/build/pkgs/openssl/checksums.ini @@ -1,5 +1,6 @@ tarball=openssl-VERSION.tar.gz sha1=b48e20c07facfdf6da9ad43a6c5126d51897699b +sha256=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 md5=e6a199cdf867873eef2c6491b674edbc cksum=391245670 upstream_url=https://www.openssl.org/source/openssl-VERSION.tar.gz diff --git a/build/pkgs/osqp_python/checksums.ini b/build/pkgs/osqp_python/checksums.ini index f4edea03b65..8ea4b8fee7c 100644 --- a/build/pkgs/osqp_python/checksums.ini +++ b/build/pkgs/osqp_python/checksums.ini @@ -1,5 +1,6 @@ tarball=osqp-VERSION.tar.gz sha1=3358e48aa6d81496665a8b0ee157465ce6cd329a +sha256=03e460e683ec2ce0f839353ddfa3c4c8ffa509ab8cf6a2b2afbb586fa453e180 md5=22ee4f843ca15a98437f053e47d15e3d cksum=2552259420 upstream_url=https://pypi.io/packages/source/o/osqp/osqp-VERSION.tar.gz diff --git a/build/pkgs/overrides/checksums.ini b/build/pkgs/overrides/checksums.ini index cd313073a39..1f155f1fc0f 100644 --- a/build/pkgs/overrides/checksums.ini +++ b/build/pkgs/overrides/checksums.ini @@ -1,5 +1,6 @@ tarball=overrides-VERSION-py3-none-any.whl sha1=740e9e607a9e4f78dea7a1b82bcb27f285bc5f48 +sha256=3ad24583f86d6d7a49049695efe9933e67ba62f0c7625d53c59fa832ce4b8b7d md5=ed4ab0bd43112d05105576f0a50f5aa7 cksum=3865068538 upstream_url=https://pypi.io/packages/py3/o/overrides/overrides-VERSION-py3-none-any.whl diff --git a/build/pkgs/p_group_cohomology/checksums.ini b/build/pkgs/p_group_cohomology/checksums.ini index 2f5d6e8f3b5..21c1a5a188e 100644 --- a/build/pkgs/p_group_cohomology/checksums.ini +++ b/build/pkgs/p_group_cohomology/checksums.ini @@ -1,5 +1,6 @@ tarball=p_group_cohomology-VERSION.tar.xz sha1=d1d9a54f212a6de7d6a7e3afff80ffc3475264ad +sha256=c958ffe8d56a5349372b2842da0c54c788cb0b1bc81bcebf8fb1d155320ae018 md5=9a57cd7dd045dfd5e014473d543060c2 cksum=2489285741 upstream_url=https://github.com/sagemath/p_group_cohomology/releases/download/vVERSION/p_group_cohomology-VERSION.tar.xz diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini index 3ee369817f0..1add37fb719 100644 --- a/build/pkgs/packaging/checksums.ini +++ b/build/pkgs/packaging/checksums.ini @@ -1,5 +1,6 @@ tarball=packaging-VERSION-py3-none-any.whl sha1=d3fb436d835b252ea884a5d172d7265220127f95 +sha256=8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7 md5=f6e9c6af858bd34eff07b407d3f650a1 cksum=3531019080 upstream_url=https://pypi.io/packages/py3/p/packaging/packaging-VERSION-py3-none-any.whl diff --git a/build/pkgs/palettable/checksums.ini b/build/pkgs/palettable/checksums.ini index 9370cd53f51..0e275bd8ec4 100644 --- a/build/pkgs/palettable/checksums.ini +++ b/build/pkgs/palettable/checksums.ini @@ -1,5 +1,6 @@ tarball=palettable-VERSION.tar.gz sha1=4bdbbeae7f20bc71ce8246cb5269da2c3046ad62 +sha256=72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd md5=a7601ef44fafa2b8914fa1f9626d860e cksum=3558581833 upstream_url=https://pypi.io/packages/source/p/palettable/palettable-VERSION.tar.gz diff --git a/build/pkgs/palp/checksums.ini b/build/pkgs/palp/checksums.ini index 5de0d462b06..cb931869561 100644 --- a/build/pkgs/palp/checksums.ini +++ b/build/pkgs/palp/checksums.ini @@ -1,5 +1,6 @@ tarball=palp-VERSION.tar.gz sha1=99b0d8f7c998549f9f1be6302950659ff01bac77 +sha256=0540e827b1b481a55285146377b3910991cd6bc8da67f351c15226eec6a95702 md5=b9508b9e08954215c88320d4a5940d91 cksum=2027098672 upstream_url=http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-VERSION.tar.gz diff --git a/build/pkgs/pandoc_attributes/checksums.ini b/build/pkgs/pandoc_attributes/checksums.ini index 0757440458b..bcef3442416 100644 --- a/build/pkgs/pandoc_attributes/checksums.ini +++ b/build/pkgs/pandoc_attributes/checksums.ini @@ -1,4 +1,5 @@ tarball=pandoc_attributes-VERSION.zip sha1=e06bdb16ece5ea6aa64d93ef1ea6c836fe971c5d +sha256=b6fc22f658c7d65a551ef7700e8e08e445bdadf626c5e5c617187f586882af00 md5=dd541a17acd84f398e29dc57d1add4ae cksum=723213323 diff --git a/build/pkgs/pandocfilters/checksums.ini b/build/pkgs/pandocfilters/checksums.ini index 507472f9621..e9178670bec 100644 --- a/build/pkgs/pandocfilters/checksums.ini +++ b/build/pkgs/pandocfilters/checksums.ini @@ -1,5 +1,6 @@ tarball=pandocfilters-VERSION.tar.gz sha1=bdee4f81063c02168b421640f3e18917011153df +sha256=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38 md5=d625fec43c27f091e465ff28df763a66 cksum=1628002258 upstream_url=https://pypi.io/packages/source/p/pandocfilters/pandocfilters-VERSION.tar.gz diff --git a/build/pkgs/pari/checksums.ini b/build/pkgs/pari/checksums.ini index b6fc05baa1a..364c257a3d7 100644 --- a/build/pkgs/pari/checksums.ini +++ b/build/pkgs/pari/checksums.ini @@ -1,5 +1,6 @@ tarball=pari-VERSION.tar.gz sha1=ae962671b5bf86849d2021113dfb5b2f59331a10 +sha256=c3545bfee0c6dfb40b77fb4bbabaf999d82e60069b9f6d28bcb6cf004c8c5c0f md5=4ab5c81d93f4bccb94e483b8b48fc336 cksum=598072677 upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz diff --git a/build/pkgs/pari_elldata/checksums.ini b/build/pkgs/pari_elldata/checksums.ini index d3858e5dde1..a41202a5e2b 100644 --- a/build/pkgs/pari_elldata/checksums.ini +++ b/build/pkgs/pari_elldata/checksums.ini @@ -1,4 +1,5 @@ tarball=elldata.tgz sha1=85f51ef85390f0f737fba10567d7d47f99249780 +sha256=6c909f09bb19c8a8125145b1aac3758915daa7fd03530bc909dcb460d4eecb38 md5=0ae49b7aa6a012ccd2804bfb831d3686 cksum=1365963558 diff --git a/build/pkgs/pari_galdata/checksums.ini b/build/pkgs/pari_galdata/checksums.ini index 82fe02e0371..fe645765774 100644 --- a/build/pkgs/pari_galdata/checksums.ini +++ b/build/pkgs/pari_galdata/checksums.ini @@ -1,4 +1,5 @@ tarball=pari_galdata-VERSION.tar.bz2 sha1=4ae710687cb711c49645314c28d53ab3b3a38706 +sha256=3d3ce1cec77a523971f53c225b78ed8bdd23e2fbfce03742d93a65a8fe4021cf md5=b661c455bb1b2028b3b957d3bc8595de cksum=3937576682 diff --git a/build/pkgs/pari_galpol/checksums.ini b/build/pkgs/pari_galpol/checksums.ini index 530a5a72f09..c335e7fc4ba 100644 --- a/build/pkgs/pari_galpol/checksums.ini +++ b/build/pkgs/pari_galpol/checksums.ini @@ -1,4 +1,5 @@ tarball=galpol.tgz sha1=b072d752207bf598c86c896dc2ce35314fd9aff4 +sha256=562af28316ee335ee38c1172c2d5ecccb79f55c368fb9f2c6f40fc0f416bb01b md5=6ebd6057f1b252f7f9b77525c27f447d cksum=547352040 diff --git a/build/pkgs/pari_jupyter/checksums.ini b/build/pkgs/pari_jupyter/checksums.ini index 43f7d3085ca..10a8f3e392b 100644 --- a/build/pkgs/pari_jupyter/checksums.ini +++ b/build/pkgs/pari_jupyter/checksums.ini @@ -1,5 +1,6 @@ tarball=pari-jupyter-VERSION.tar.gz sha1=b410ee0352cd58f5f140246540b71b5ff83ddf73 +sha256=7cd9291d05b92b8303c6ae8cf25622e5ecbab1ac2bcf13911f900ea987471b9d md5=5a8353259bbaec1f0314d1b1b726c9cb cksum=1481362803 upstream_url=https://pypi.io/packages/source/p/pari_jupyter/pari-jupyter-VERSION.tar.gz diff --git a/build/pkgs/pari_nftables/checksums.ini b/build/pkgs/pari_nftables/checksums.ini index 3463064475d..c7393260f2f 100644 --- a/build/pkgs/pari_nftables/checksums.ini +++ b/build/pkgs/pari_nftables/checksums.ini @@ -1,4 +1,5 @@ tarball=nftables.tgz sha1=90df66222346b0dbca68925671a374f5e286daeb +sha256=8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92 md5=82788524f36bbbba886785c940c859db cksum=1478870095 diff --git a/build/pkgs/pari_seadata/checksums.ini b/build/pkgs/pari_seadata/checksums.ini index 097c3a558d7..4f9c4f3072b 100644 --- a/build/pkgs/pari_seadata/checksums.ini +++ b/build/pkgs/pari_seadata/checksums.ini @@ -1,4 +1,5 @@ tarball=seadata.tgz sha1=fa3deb36df0ce71a466eb0ff0d4a18d48d44e8b9 +sha256=c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833 md5=6e9c119ccb3c65916a48e1a8cd899558 cksum=3015139491 diff --git a/build/pkgs/pari_seadata_small/checksums.ini b/build/pkgs/pari_seadata_small/checksums.ini index efca3bbdc15..92e4f20adbf 100644 --- a/build/pkgs/pari_seadata_small/checksums.ini +++ b/build/pkgs/pari_seadata_small/checksums.ini @@ -1,4 +1,5 @@ tarball=pari_seadata_small-VERSION.tar.bz2 sha1=9df70728bfae81fad4ff66a3c7f57d99bbe70732 +sha256=1992496212a965958ac36bb14c8e59d87086261c18d70aa4bc45ae4da464dcda md5=5a9a6200e4536d2c6b4020c4313721f5 cksum=3561726107 diff --git a/build/pkgs/parso/checksums.ini b/build/pkgs/parso/checksums.ini index fdaddf5e808..bb4b8e263b9 100644 --- a/build/pkgs/parso/checksums.ini +++ b/build/pkgs/parso/checksums.ini @@ -1,5 +1,6 @@ tarball=parso-VERSION.tar.gz sha1=1a34ea6e597a6498ef5c154195f9ffe8dda3d254 +sha256=8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 md5=7ee251113f31f8d851c4a5d9e98977cb cksum=566121311 upstream_url=https://pypi.io/packages/source/p/parso/parso-VERSION.tar.gz diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini index fa51ec84b12..717a911cfd4 100644 --- a/build/pkgs/patch/checksums.ini +++ b/build/pkgs/patch/checksums.ini @@ -1,4 +1,5 @@ tarball=patch-VERSION.tar.gz sha1=04d23f6e48e95efb07d12ccf44d1f35fb210f457 +sha256=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f md5=ed4d5674ef4543b4eb463db168886dc7 cksum=2777655587 diff --git a/build/pkgs/patchelf/checksums.ini b/build/pkgs/patchelf/checksums.ini index bd52a82dbc5..3181e199b48 100644 --- a/build/pkgs/patchelf/checksums.ini +++ b/build/pkgs/patchelf/checksums.ini @@ -1,5 +1,6 @@ tarball=patchelf-VERSION.tar.bz2 sha1=5d9c1690c0fbe70c312f43d597e04b6c1eeffc60 +sha256=39e8aeccd7495d54df094d2b4a7c08010ff7777036faaf24f28e07777d1598e2 md5=04d243d3626a33201b0d6eef0e2c4317 cksum=92812155 upstream_url=https://github.com/NixOS/patchelf/releases/download/VERSION/patchelf-VERSION.tar.bz2 diff --git a/build/pkgs/pathspec/checksums.ini b/build/pkgs/pathspec/checksums.ini index a562884cca1..c2f89e64a60 100644 --- a/build/pkgs/pathspec/checksums.ini +++ b/build/pkgs/pathspec/checksums.ini @@ -1,5 +1,6 @@ tarball=pathspec-VERSION-py3-none-any.whl sha1=e31b7b2b1a59ab192eb2e92ac283211a11039769 +sha256=a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 md5=53caa061bbda861c5b4766f41b084ec8 cksum=1745881358 upstream_url=https://pypi.io/packages/py3/p/pathspec/pathspec-VERSION-py3-none-any.whl diff --git a/build/pkgs/perl_term_readline_gnu/checksums.ini b/build/pkgs/perl_term_readline_gnu/checksums.ini index cc68c96c1ed..c3e43ed79dc 100644 --- a/build/pkgs/perl_term_readline_gnu/checksums.ini +++ b/build/pkgs/perl_term_readline_gnu/checksums.ini @@ -1,4 +1,5 @@ tarball=Term-ReadLine-Gnu-VERSION.tar.gz sha1=1f57fe986d56c6afa5eb868ca36dc5f0f8dcc3b6 +sha256=575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125 md5=514619d68bda1618da61b19d04b5cefe cksum=677275902 diff --git a/build/pkgs/pexpect/checksums.ini b/build/pkgs/pexpect/checksums.ini index e4c530a042d..7173f6dcf03 100644 --- a/build/pkgs/pexpect/checksums.ini +++ b/build/pkgs/pexpect/checksums.ini @@ -1,5 +1,6 @@ tarball=pexpect-VERSION.tar.gz sha1=5bff9230c419eecbf701059f104e74a3f3a1b208 +sha256=ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f md5=f48d48325ee7f1221add0396ea9e2f14 cksum=2367435032 upstream_url=https://pypi.io/packages/source/p/pexpect/pexpect-VERSION.tar.gz diff --git a/build/pkgs/pickleshare/checksums.ini b/build/pkgs/pickleshare/checksums.ini index 13537caad36..d27650dfb10 100644 --- a/build/pkgs/pickleshare/checksums.ini +++ b/build/pkgs/pickleshare/checksums.ini @@ -1,4 +1,5 @@ tarball=pickleshare-VERSION.tar.gz sha1=c583011994ee0733ea4a6330af81c175180dcc3d +sha256=87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca md5=44ab782615894a812ab96669a122a634 cksum=1895214791 diff --git a/build/pkgs/pillow/checksums.ini b/build/pkgs/pillow/checksums.ini index 48c6c3f46ae..e528e33d751 100644 --- a/build/pkgs/pillow/checksums.ini +++ b/build/pkgs/pillow/checksums.ini @@ -1,5 +1,6 @@ tarball=Pillow-VERSION.tar.gz sha1=be2dc6aeee145894f3ccbc2358a37f7849e710aa +sha256=e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 md5=a55618c5d2fd64048dd3ea41bc39f7cd cksum=3616378816 upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz diff --git a/build/pkgs/pint/checksums.ini b/build/pkgs/pint/checksums.ini index b852d25efe6..848eb608be8 100644 --- a/build/pkgs/pint/checksums.ini +++ b/build/pkgs/pint/checksums.ini @@ -1,5 +1,6 @@ tarball=Pint-VERSION.tar.gz sha1=c14ac08ca2d5a68d79ea7cd2252dc7e2a572c56a +sha256=387cf04078dc7dfe4a708033baad54ab61d82ab06c4ee3d4922b1e45d5626067 md5=522a8e633e487e92ba54ccbec395947a cksum=2139030399 upstream_url=https://pypi.io/packages/source/p/pint/Pint-VERSION.tar.gz diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini index 0558c5caa45..71a0b0a27cf 100644 --- a/build/pkgs/pip/checksums.ini +++ b/build/pkgs/pip/checksums.ini @@ -1,5 +1,6 @@ tarball=pip-VERSION-py3-none-any.whl sha1=4b2baddc0673f73017e531648a9ee27e47925e7a +sha256=55eb67bb6171d37447e82213be585b75fe2b12b359e993773aca4de9247a052b md5=5d2d058044a3ae2800d18e358ddc72ca cksum=1470281176 upstream_url=https://pypi.io/packages/py3/p/pip/pip-VERSION-py3-none-any.whl diff --git a/build/pkgs/pkgconf/checksums.ini b/build/pkgs/pkgconf/checksums.ini index a65038ec333..2d0338f34c5 100644 --- a/build/pkgs/pkgconf/checksums.ini +++ b/build/pkgs/pkgconf/checksums.ini @@ -1,5 +1,6 @@ tarball=pkgconf-VERSION.tar.xz sha1=2b76eb2d88b2c4aecba937b337d218a13b67f14b +sha256=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf md5=823212dc241793df8ff1d097769a3473 cksum=896868382 upstream_url=https://distfiles.dereferenced.org/pkgconf/pkgconf-VERSION.tar.xz diff --git a/build/pkgs/pkgconfig/checksums.ini b/build/pkgs/pkgconfig/checksums.ini index 80d5aac1b27..ece11e3d368 100644 --- a/build/pkgs/pkgconfig/checksums.ini +++ b/build/pkgs/pkgconfig/checksums.ini @@ -1,5 +1,6 @@ tarball=pkgconfig-VERSION-py3-none-any.whl sha1=bca14b2806a8e8afb0bd04f8e3675550b286dda8 +sha256=d20023bbeb42ee6d428a0fac6e0904631f545985a10cdd71a20aa58bc47a4209 md5=80f1e06563f3af0f090694db58736455 cksum=15738577 upstream_url=https://pypi.io/packages/py3/p/pkgconfig/pkgconfig-VERSION-py3-none-any.whl diff --git a/build/pkgs/planarity/checksums.ini b/build/pkgs/planarity/checksums.ini index 309daa93278..f5b0e9b8ca0 100644 --- a/build/pkgs/planarity/checksums.ini +++ b/build/pkgs/planarity/checksums.ini @@ -1,5 +1,6 @@ tarball=planarity-VERSION.tar.gz sha1=8407bccf33c07bf0dae22d79b5e6ac7d89c62ea3 +sha256=63e979d37e7160e4e72a286a8dd7ba74e4795f63742f417c8ba1cea2b2a51280 md5=200116e6a67544c8e94f9de7c3ba1b1a cksum=4207261512 upstream_url=http://users.ox.ac.uk/~coml0531/sage/planarity-VERSION.tar.gz diff --git a/build/pkgs/plantri/checksums.ini b/build/pkgs/plantri/checksums.ini index f999a981a69..4975c4e0e3d 100644 --- a/build/pkgs/plantri/checksums.ini +++ b/build/pkgs/plantri/checksums.ini @@ -1,5 +1,6 @@ tarball=plantri${VERSION_MAJOR}${VERSION_MINOR}.tar.gz sha1=a04aec2fa90c43f1c9bef59d041a54d8fa5bf562 +sha256=5036804de6e3bee7bd54b6e46009a2c1f7c89067010b5e532cda84907a3559a2 md5=ea765b3508dd56384f94ad1f032e2dd4 cksum=3200215885 upstream_url=https://users.cecs.anu.edu.au/~bdm/plantri/plantri${VERSION_MAJOR}${VERSION_MINOR}.tar.gz diff --git a/build/pkgs/platformdirs/checksums.ini b/build/pkgs/platformdirs/checksums.ini index 3757f701faf..896ef48c4f2 100644 --- a/build/pkgs/platformdirs/checksums.ini +++ b/build/pkgs/platformdirs/checksums.ini @@ -1,5 +1,6 @@ tarball=platformdirs-VERSION-py3-none-any.whl sha1=cafa761738da959f2df0a8a92da4c72fd8eaf93e +sha256=11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380 md5=487007776ff343efc509b68d08cd7fd7 cksum=162426958 upstream_url=https://pypi.io/packages/py3/p/platformdirs/platformdirs-VERSION-py3-none-any.whl diff --git a/build/pkgs/pluggy/checksums.ini b/build/pkgs/pluggy/checksums.ini index 02c89db5e83..5aaa610b023 100644 --- a/build/pkgs/pluggy/checksums.ini +++ b/build/pkgs/pluggy/checksums.ini @@ -1,5 +1,6 @@ tarball=pluggy-VERSION-py3-none-any.whl sha1=25492905db99a151fc86368f0cca518a5ee5a832 +sha256=d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7 md5=9d0a58f023a0642eebae7c19f2729b72 cksum=273236458 upstream_url=https://pypi.io/packages/py3/p/pluggy/pluggy-VERSION-py3-none-any.whl diff --git a/build/pkgs/ply/checksums.ini b/build/pkgs/ply/checksums.ini index bf06a90d888..acd937e47ac 100644 --- a/build/pkgs/ply/checksums.ini +++ b/build/pkgs/ply/checksums.ini @@ -1,5 +1,6 @@ tarball=ply-VERSION.tar.gz sha1=10a555a32095991fbc7f7ed10c677a14e21fad1d +sha256=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 md5=6465f602e656455affcd7c5734c638f8 cksum=375283112 upstream_url=https://pypi.io/packages/source/p/ply/ply-VERSION.tar.gz diff --git a/build/pkgs/polylib/checksums.ini b/build/pkgs/polylib/checksums.ini index 9a8aed1a91f..ea380bcd4f7 100644 --- a/build/pkgs/polylib/checksums.ini +++ b/build/pkgs/polylib/checksums.ini @@ -1,4 +1,5 @@ tarball=polylib-VERSION.tar.gz sha1=72b23c09a50ce9583c419e8376544630d6f99ea3 +sha256=84622ff9dfa5d06f0c266960ed078bd3577a30fde6d7f8bed1041b9838cb731f md5=c0088786e0a5ae64b7cc47ad19ae4f83 cksum=116350713 diff --git a/build/pkgs/polymake/checksums.ini b/build/pkgs/polymake/checksums.ini index 2ef0a4e00be..4cfef370157 100644 --- a/build/pkgs/polymake/checksums.ini +++ b/build/pkgs/polymake/checksums.ini @@ -1,5 +1,6 @@ tarball=polymake-VERSION-minimal.tar.bz2 sha1=0445f1a6d174906317a07c4bef299d0b4502c779 +sha256=5df6f0acd700119bd0c4b5766762852ffbd857765b5dcc88802ff5d2108add23 md5=7a86d17822f229d6088dd7d65c8c1cad cksum=2732048385 upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2 diff --git a/build/pkgs/polytopes_db/checksums.ini b/build/pkgs/polytopes_db/checksums.ini index ceb452697f3..8bc43fcca2a 100644 --- a/build/pkgs/polytopes_db/checksums.ini +++ b/build/pkgs/polytopes_db/checksums.ini @@ -1,4 +1,5 @@ tarball=polytopes_db-VERSION.tar.bz2 sha1=6a9d12740588ea5c0efc0e82776d8386e7887b47 +sha256=cb788bdfca6e00864ec0bfa67932a68ae68bfeb9c527a91be90ad218026a0ce0 md5=64c5fba9568891a2dbde5d433ce668e2 cksum=3276110922 diff --git a/build/pkgs/polytopes_db_4d/checksums.ini b/build/pkgs/polytopes_db_4d/checksums.ini index d87e456c4a8..478eaa27ef8 100644 --- a/build/pkgs/polytopes_db_4d/checksums.ini +++ b/build/pkgs/polytopes_db_4d/checksums.ini @@ -1,5 +1,6 @@ tarball=polytopes_db_4d-VERSION.spkg sha1=c9779821e365df2d7f9bc684f9e2ec0e95fb8650 +sha256=44fb1552261acca8b9e2e3253098ea3f364663bc48343fdbd121951bf02b8e55 md5=fe775a26fd7b2afc187e9bfabfb1b86a cksum=3415837678 upstream_url=http://ftp.sparcs.org/sage/spkg/huge/polytopes_db_4d-VERSION.spkg diff --git a/build/pkgs/ppl/checksums.ini b/build/pkgs/ppl/checksums.ini index ba15444f72f..da1649c5c6e 100644 --- a/build/pkgs/ppl/checksums.ini +++ b/build/pkgs/ppl/checksums.ini @@ -1,4 +1,5 @@ tarball=ppl-VERSION.tar.bz2 sha1=727ac98a9365a617dc26bfd7961417d9d3ff4e74 +sha256=2d470b0c262904f190a19eac57fb5c2387b1bfc3510de25a08f3c958df62fdf1 md5=50a757d37cced76e51b97709a4cf455a cksum=158857820 diff --git a/build/pkgs/pplpy/checksums.ini b/build/pkgs/pplpy/checksums.ini index 73f16fc3f00..3a16862ca85 100644 --- a/build/pkgs/pplpy/checksums.ini +++ b/build/pkgs/pplpy/checksums.ini @@ -1,5 +1,6 @@ tarball=pplpy-VERSION.tar.gz sha1=dc9e8a7a867ee1c066bdbecf22b6a59dc2052711 +sha256=db7a3b571d6ef053f75137975e947c3a1c1e45a30bab90eaf215b4e5cc15797e md5=220fc7ab95d7bd62d40acb276f9b149f cksum=2156962833 upstream_url=https://pypi.io/packages/source/p/pplpy/pplpy-VERSION.tar.gz diff --git a/build/pkgs/primecount/checksums.ini b/build/pkgs/primecount/checksums.ini index 11900687fca..504d1ff1150 100644 --- a/build/pkgs/primecount/checksums.ini +++ b/build/pkgs/primecount/checksums.ini @@ -1,5 +1,6 @@ tarball=primecount-VERSION.tar.gz sha1=3854ef6c7f454086f31aa80d68f628c5b685d702 +sha256=e9a1fa2c41b9a7b84f2bead21b53cc9f7e2a5a0a34ddd818431a4e789aa44230 md5=a566d9b95ccc01f0c7c1329ca4c06b89 cksum=1260437024 upstream_url=https://github.com/kimwalisch/primecount/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/primecountpy/checksums.ini b/build/pkgs/primecountpy/checksums.ini index f8f503d3ee6..8b594df6f17 100644 --- a/build/pkgs/primecountpy/checksums.ini +++ b/build/pkgs/primecountpy/checksums.ini @@ -1,5 +1,6 @@ tarball=primecountpy-VERSION.tar.gz sha1=3526784adad04d67a15f05fb1367d12ec50a59dc +sha256=78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676 md5=e25806cba603d04cc7bc1852df5d0b92 cksum=4293153144 upstream_url=https://pypi.io/packages/source/p/primecountpy/primecountpy-VERSION.tar.gz diff --git a/build/pkgs/primesieve/checksums.ini b/build/pkgs/primesieve/checksums.ini index 2f3dc247407..67625270518 100644 --- a/build/pkgs/primesieve/checksums.ini +++ b/build/pkgs/primesieve/checksums.ini @@ -1,5 +1,6 @@ tarball=primesieve-VERSION.tar.gz sha1=cb0a7c49b37b51980fc610d3041b9591c67a460c +sha256=b29a7ec855764ce7474d00be03e1d83209bd097faa3778382dfb73a06866097e md5=73f51a77b0d43356b404999e777ad910 cksum=1567518743 upstream_url=https://github.com/kimwalisch/primesieve/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/prometheus_client/checksums.ini b/build/pkgs/prometheus_client/checksums.ini index a4d2d472c6e..e1224c3fee3 100644 --- a/build/pkgs/prometheus_client/checksums.ini +++ b/build/pkgs/prometheus_client/checksums.ini @@ -1,5 +1,6 @@ tarball=prometheus_client-VERSION.tar.gz sha1=dabd66e652ea8275b4980e337cefcea68cc0b560 +sha256=5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a md5=295568805ef560acd16eecb18137ef30 cksum=1955633542 upstream_url=https://pypi.io/packages/source/p/prometheus-client/prometheus_client-VERSION.tar.gz diff --git a/build/pkgs/prompt_toolkit/checksums.ini b/build/pkgs/prompt_toolkit/checksums.ini index 1d0b8a0a02b..7cdac0864b7 100644 --- a/build/pkgs/prompt_toolkit/checksums.ini +++ b/build/pkgs/prompt_toolkit/checksums.ini @@ -1,5 +1,6 @@ tarball=prompt_toolkit-VERSION.tar.gz sha1=b5ada8cb45c11f9184c990bd33a98d3d690e6edc +sha256=3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d md5=f33c0f4ae8d11addababf6d90c98f8bc cksum=1262534330 upstream_url=https://pypi.io/packages/source/p/prompt_toolkit/prompt_toolkit-VERSION.tar.gz diff --git a/build/pkgs/psutil/checksums.ini b/build/pkgs/psutil/checksums.ini index f9d3d687f9d..6c2656fb44f 100644 --- a/build/pkgs/psutil/checksums.ini +++ b/build/pkgs/psutil/checksums.ini @@ -1,5 +1,6 @@ tarball=psutil-VERSION.tar.gz sha1=24c493ef33d4df44e76a1801e480b4185bd911c5 +sha256=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a md5=eec35090e7474e471a12f0dd16c981f9 cksum=3278898496 upstream_url=https://pypi.io/packages/source/p/psutil/psutil-VERSION.tar.gz diff --git a/build/pkgs/ptyprocess/checksums.ini b/build/pkgs/ptyprocess/checksums.ini index d55046be142..a3645e536f8 100644 --- a/build/pkgs/ptyprocess/checksums.ini +++ b/build/pkgs/ptyprocess/checksums.ini @@ -1,5 +1,6 @@ tarball=ptyprocess-VERSION.tar.gz sha1=2d8830d1025c8e33149c7723c2f283122f9488c1 +sha256=5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220 md5=9da200c397cb1752209a6b718b6cfc68 cksum=2094263560 upstream_url=https://pypi.io/packages/source/p/ptyprocess/ptyprocess-VERSION.tar.gz diff --git a/build/pkgs/pure_eval/checksums.ini b/build/pkgs/pure_eval/checksums.ini index d83180b3c78..bf1b13dabd5 100644 --- a/build/pkgs/pure_eval/checksums.ini +++ b/build/pkgs/pure_eval/checksums.ini @@ -1,5 +1,6 @@ tarball=pure_eval-VERSION.tar.gz sha1=45813e75b359573c2ef49430673812ea3f8f81f2 +sha256=2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 md5=212fd27ca2c58d9effddec69748d738a cksum=757891676 upstream_url=https://pypi.io/packages/source/p/pure_eval/pure_eval-VERSION.tar.gz diff --git a/build/pkgs/py/checksums.ini b/build/pkgs/py/checksums.ini index 83f808c63bc..27761c54a3c 100644 --- a/build/pkgs/py/checksums.ini +++ b/build/pkgs/py/checksums.ini @@ -1,5 +1,6 @@ tarball=py-VERSION.tar.gz sha1=bb8aa4f56e3ced1cd61906495150e7ca2dacc10b +sha256=51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 md5=bde7dcc1cb452a1e10206ef2f811ba88 cksum=1774689161 upstream_url=https://pypi.io/packages/source/p/py/py-VERSION.tar.gz diff --git a/build/pkgs/pybind11/checksums.ini b/build/pkgs/pybind11/checksums.ini index c8b9c661568..5d2fda8c628 100644 --- a/build/pkgs/pybind11/checksums.ini +++ b/build/pkgs/pybind11/checksums.ini @@ -1,5 +1,6 @@ tarball=pybind11-VERSION.tar.gz sha1=3c75333a9056f0be18eb612803cd46a2bb0c87fc +sha256=00cd59116a6e8155aecd9174f37ba299d1d397ed4a6b86ac1dfe01b3e40f2cc4 md5=67c58224e41c442e47fa84e7789c2c39 cksum=419587142 upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz diff --git a/build/pkgs/pycosat/checksums.ini b/build/pkgs/pycosat/checksums.ini index 0ded8feb643..d7d50d5daf8 100644 --- a/build/pkgs/pycosat/checksums.ini +++ b/build/pkgs/pycosat/checksums.ini @@ -1,4 +1,5 @@ tarball=pycosat-VERSION.tar.gz sha1=1c2243fcc52491db8aa11558d4df626f28311757 +sha256=abcaf3d6afb332b0d8363590d0aaa81f00f71142900fbae2608f7d595d5e4492 md5=08e378db1c15dc1668bc62897bd325a5 cksum=2006887185 diff --git a/build/pkgs/pycparser/checksums.ini b/build/pkgs/pycparser/checksums.ini index c4eb97e2c59..129119057cb 100644 --- a/build/pkgs/pycparser/checksums.ini +++ b/build/pkgs/pycparser/checksums.ini @@ -1,5 +1,6 @@ tarball=pycparser-VERSION.tar.gz sha1=359c718c6ece361047f61846b9fa4ea0239576dc +sha256=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 md5=48f7d743bf018f7bb2ffc5fb976d1492 cksum=1065143416 upstream_url=https://pypi.io/packages/source/p/pycparser/pycparser-VERSION.tar.gz diff --git a/build/pkgs/pygments/checksums.ini b/build/pkgs/pygments/checksums.ini index 45387936c10..1f06c35b718 100644 --- a/build/pkgs/pygments/checksums.ini +++ b/build/pkgs/pygments/checksums.ini @@ -1,5 +1,6 @@ tarball=pygments-VERSION-py3-none-any.whl sha1=053e17b72ffea04e200d7b34edbe0f96b4b68e4b +sha256=b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c md5=05bab8cd38860c62d6e146ec2949fefe cksum=964137483 upstream_url=https://pypi.io/packages/py3/p/pygments/pygments-VERSION-py3-none-any.whl diff --git a/build/pkgs/pynormaliz/checksums.ini b/build/pkgs/pynormaliz/checksums.ini index 327461a230f..08b0154f025 100644 --- a/build/pkgs/pynormaliz/checksums.ini +++ b/build/pkgs/pynormaliz/checksums.ini @@ -1,5 +1,6 @@ tarball=PyNormaliz-VERSION.tar.gz sha1=08617ca50ce0e0317a3377381bf37c1a0ab826c1 +sha256=359218cf35f400c43f338a132b7887f6a2affb05057c4e7eaa315a9f2b6a8b39 md5=9ae78f7638741c26b588443f0d6024ce cksum=4090940781 upstream_url=https://pypi.io/packages/source/p/pynormaliz/PyNormaliz-VERSION.tar.gz diff --git a/build/pkgs/pyparsing/checksums.ini b/build/pkgs/pyparsing/checksums.ini index a6e8820e3c3..339595c5a3f 100644 --- a/build/pkgs/pyparsing/checksums.ini +++ b/build/pkgs/pyparsing/checksums.ini @@ -1,5 +1,6 @@ tarball=pyparsing-VERSION-py3-none-any.whl sha1=c44cd9476ad90a48af0f27d8f7966136b2a93fc6 +sha256=32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb md5=314b4874edfbc558e02f89d371043e9f cksum=3947575213 upstream_url=https://pypi.io/packages/py3/p/pyparsing/pyparsing-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_api/checksums.ini b/build/pkgs/pyproject_api/checksums.ini index 9fc8e383a7c..240b5e9e3e0 100644 --- a/build/pkgs/pyproject_api/checksums.ini +++ b/build/pkgs/pyproject_api/checksums.ini @@ -1,5 +1,6 @@ tarball=pyproject_api-VERSION-py3-none-any.whl sha1=5ea24c784a68fd0ef0228c332dc078ce64387eb8 +sha256=4c0116d60476b0786c88692cf4e325a9814965e2469c5998b830bba16b183675 md5=8941280ffec3eb79a8cd6e380774980f cksum=913049079 upstream_url=https://pypi.io/packages/py3/p/pyproject_api/pyproject_api-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_metadata/checksums.ini b/build/pkgs/pyproject_metadata/checksums.ini index 6fb14a63679..f7bc77910bd 100644 --- a/build/pkgs/pyproject_metadata/checksums.ini +++ b/build/pkgs/pyproject_metadata/checksums.ini @@ -1,5 +1,6 @@ tarball=pyproject-metadata-VERSION.tar.gz sha1=41fba5c33917d77b9364fadb76e590e86789634d +sha256=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67 md5=ca5e9527cff96153a976e14530b53746 cksum=2053869519 upstream_url=https://pypi.io/packages/source/p/pyproject_metadata/pyproject-metadata-VERSION.tar.gz diff --git a/build/pkgs/pyrsistent/checksums.ini b/build/pkgs/pyrsistent/checksums.ini index cffce58a92e..d27f97b471f 100644 --- a/build/pkgs/pyrsistent/checksums.ini +++ b/build/pkgs/pyrsistent/checksums.ini @@ -1,5 +1,6 @@ tarball=pyrsistent-VERSION.tar.gz sha1=79980873658f7634ae25758b9710088b62e0612a +sha256=1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 md5=761266eab1f9dc9280cdb0a6d2dedb08 cksum=2666822194 upstream_url=https://pypi.io/packages/source/p/pyrsistent/pyrsistent-VERSION.tar.gz diff --git a/build/pkgs/pysingular/checksums.ini b/build/pkgs/pysingular/checksums.ini index eedd093dcdd..d9faed7471a 100644 --- a/build/pkgs/pysingular/checksums.ini +++ b/build/pkgs/pysingular/checksums.ini @@ -1,5 +1,6 @@ tarball=PySingular-VERSION.tar.gz sha1=c8d4bbe4552490aac37afe6d87a2cd3a7b445a7e +sha256=ca03d1d7538fc61f4350acff42708c6c443e0232712a2dc42ce72140831ef60c md5=84a8639d33a5b03637a7ca3ea322b085 cksum=822399760 upstream_url=https://pypi.io/packages/source/p/pysingular/PySingular-VERSION.tar.gz diff --git a/build/pkgs/python3/checksums.ini b/build/pkgs/python3/checksums.ini index f2727eaf401..4e0a51185d6 100644 --- a/build/pkgs/python3/checksums.ini +++ b/build/pkgs/python3/checksums.ini @@ -1,5 +1,6 @@ tarball=Python-VERSION.tar.xz sha1=89ee31611b73dc0c32c178d15aa208734b462c5a +sha256=85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f md5=4efe92adf28875c77d3b9b2e8d3bc44a cksum=2916176597 upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz diff --git a/build/pkgs/python_igraph/checksums.ini b/build/pkgs/python_igraph/checksums.ini index e3ba512eb8f..b3366a07c2e 100644 --- a/build/pkgs/python_igraph/checksums.ini +++ b/build/pkgs/python_igraph/checksums.ini @@ -1,5 +1,6 @@ tarball=python-igraph-VERSION.tar.gz sha1=ef7ee85cb1bc83109c744d5dd6bbe5e37598ce3f +sha256=e55df60f882a51b8e8c1c5e7e940c5f90685d75634ea6df63bebcc983397adfa md5=788bd70bd286651774f15b20af956081 cksum=1447848766 upstream_url=https://pypi.io/packages/source/i/igraph/igraph-VERSION.tar.gz diff --git a/build/pkgs/python_json_logger/checksums.ini b/build/pkgs/python_json_logger/checksums.ini index b17d08d7100..9442f838eea 100644 --- a/build/pkgs/python_json_logger/checksums.ini +++ b/build/pkgs/python_json_logger/checksums.ini @@ -1,5 +1,6 @@ tarball=python_json_logger-VERSION-py3-none-any.whl sha1=c1176f521d95b5452b6169943b2b9b259e024b39 +sha256=f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd md5=618fc5f196be90261afa8372eb458f47 cksum=349551342 upstream_url=https://pypi.io/packages/py3/p/python_json_logger/python_json_logger-VERSION-py3-none-any.whl diff --git a/build/pkgs/pytz/checksums.ini b/build/pkgs/pytz/checksums.ini index 0b0e03e9863..a034f2a4d9a 100644 --- a/build/pkgs/pytz/checksums.ini +++ b/build/pkgs/pytz/checksums.ini @@ -1,5 +1,6 @@ tarball=pytz-VERSION.tar.gz sha1=be3f14bc0d6b89b8c579d8ae4e0fcb4478ff92e6 +sha256=7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b md5=84e6569fcc917b096cca1063819c4ab0 cksum=3925580206 upstream_url=https://pypi.io/packages/source/p/pytz/pytz-VERSION.tar.gz diff --git a/build/pkgs/pytz_deprecation_shim/checksums.ini b/build/pkgs/pytz_deprecation_shim/checksums.ini index 4c5f6546961..b7ad7588b93 100644 --- a/build/pkgs/pytz_deprecation_shim/checksums.ini +++ b/build/pkgs/pytz_deprecation_shim/checksums.ini @@ -1,5 +1,6 @@ tarball=pytz_deprecation_shim-VERSION.tar.gz sha1=d7900c309c26d48f6499fbda955eb80bd0b437dd +sha256=af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d md5=f563b4bdc56f40acb2498fd1caf6dd1b cksum=2491832159 upstream_url=https://pypi.io/packages/source/p/pytz_deprecation_shim/pytz_deprecation_shim-VERSION.tar.gz diff --git a/build/pkgs/pyyaml/checksums.ini b/build/pkgs/pyyaml/checksums.ini index 6918d8fda58..4d61e8acda8 100644 --- a/build/pkgs/pyyaml/checksums.ini +++ b/build/pkgs/pyyaml/checksums.ini @@ -1,5 +1,6 @@ tarball=PyYAML-VERSION.tar.gz sha1=a80d802ad8f693bed34c8fb5ee168a1872663c9a +sha256=bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 md5=c9246277af2d9a13b7018af267a0831a cksum=2585952669 upstream_url=https://pypi.io/packages/source/p/pyyaml/PyYAML-VERSION.tar.gz diff --git a/build/pkgs/pyzmq/checksums.ini b/build/pkgs/pyzmq/checksums.ini index 091981fb051..3a829c3a713 100644 --- a/build/pkgs/pyzmq/checksums.ini +++ b/build/pkgs/pyzmq/checksums.ini @@ -1,5 +1,6 @@ tarball=pyzmq-VERSION.tar.gz sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f +sha256=259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23 md5=993a646d3f1c6201a8c93bcb2d2f867e cksum=2057198190 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz diff --git a/build/pkgs/qdldl_python/checksums.ini b/build/pkgs/qdldl_python/checksums.ini index defd264f787..9fabbb66254 100644 --- a/build/pkgs/qdldl_python/checksums.ini +++ b/build/pkgs/qdldl_python/checksums.ini @@ -1,5 +1,6 @@ tarball=qdldl-VERSION.tar.gz sha1=af76c57ca1787f5e44e42f6c9f916b84ae599f1f +sha256=69c092f6e1fc23fb779a80a62e6fcdfe2eba05c925860248c4d6754f4736938f md5=63d719bd8073c1661a1baa6b510b8aad cksum=105675620 upstream_url=https://pypi.io/packages/source/q/qdldl/qdldl-VERSION.tar.gz diff --git a/build/pkgs/qepcad/checksums.ini b/build/pkgs/qepcad/checksums.ini index 48c23eaad91..7fae98da0ce 100644 --- a/build/pkgs/qepcad/checksums.ini +++ b/build/pkgs/qepcad/checksums.ini @@ -1,5 +1,6 @@ tarball=qepcad-VERSION.tar.gz sha1=644324e1224350cc663e93c5ce99b93de0de26e3 +sha256=075db8950ef2a6d11f099b85820363f7b4d61f4aff3425cb799d7567dc1254fc md5=f368459cfab2d42caa40919e60093020 cksum=783450087 upstream_url=https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/qepcad-B.VERSION.tgz diff --git a/build/pkgs/qhull/checksums.ini b/build/pkgs/qhull/checksums.ini index 65635055fa6..7951f23d116 100644 --- a/build/pkgs/qhull/checksums.ini +++ b/build/pkgs/qhull/checksums.ini @@ -1,5 +1,6 @@ tarball=qhull-VERSION.tgz sha1=2dbc240919560ac008a92363984754a70677b353 +sha256=b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e md5=295f7332269a38279478f555cc185296 cksum=3092762704 upstream_url=http://www.qhull.org/download/qhull-VERSION.tgz diff --git a/build/pkgs/readline/checksums.ini b/build/pkgs/readline/checksums.ini index 05d4f89539f..29552114deb 100644 --- a/build/pkgs/readline/checksums.ini +++ b/build/pkgs/readline/checksums.ini @@ -1,5 +1,6 @@ tarball=readline-VERSION.tar.gz sha1=8a05ad0d0ad67e18c383f1b2cf6a23bcbd46f87a +sha256=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 md5=12819fa739a78a6172400f399ab34f81 cksum=829245750 upstream_url=https://ftp.gnu.org/gnu/readline/readline-VERSION.tar.gz diff --git a/build/pkgs/referencing/checksums.ini b/build/pkgs/referencing/checksums.ini index a121d900f04..8e2b7eb5b55 100644 --- a/build/pkgs/referencing/checksums.ini +++ b/build/pkgs/referencing/checksums.ini @@ -1,5 +1,6 @@ tarball=referencing-VERSION-py3-none-any.whl sha1=9d710ba3a604d24ffded218a3813b5fd1fe2e495 +sha256=160f24a7d2411dc82b1efd96dfb083ee9e5cc9bc8e492d323e0dd853989d37b3 md5=d12db197f05a5c560011e40e1852e8fc cksum=2747749685 upstream_url=https://pypi.io/packages/py3/r/referencing/referencing-VERSION-py3-none-any.whl diff --git a/build/pkgs/requests/checksums.ini b/build/pkgs/requests/checksums.ini index a28e4ca5db0..b8786646f0b 100644 --- a/build/pkgs/requests/checksums.ini +++ b/build/pkgs/requests/checksums.ini @@ -1,5 +1,6 @@ tarball=requests-VERSION-py3-none-any.whl sha1=60b928b15e05d04a33b880a0232e44258c777740 +sha256=58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f md5=0cb4b772a1a652cf3d170a6c42a69098 cksum=1658568655 upstream_url=https://pypi.io/packages/py3/r/requests/requests-VERSION-py3-none-any.whl diff --git a/build/pkgs/rfc3339_validator/checksums.ini b/build/pkgs/rfc3339_validator/checksums.ini index f91914fd5f7..8947460155e 100644 --- a/build/pkgs/rfc3339_validator/checksums.ini +++ b/build/pkgs/rfc3339_validator/checksums.ini @@ -1,5 +1,6 @@ tarball=rfc3339_validator-VERSION-py2.py3-none-any.whl sha1=daa86cb641dfd6ebfef4ece6dea1be8fd63dec00 +sha256=24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa md5=e16fb743ff1c88d7c7de18890935b647 cksum=2330309218 upstream_url=https://pypi.io/packages/py2.py3/r/rfc3339_validator/rfc3339_validator-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/rfc3986_validator/checksums.ini b/build/pkgs/rfc3986_validator/checksums.ini index c0ad30c07e7..a320dd09153 100644 --- a/build/pkgs/rfc3986_validator/checksums.ini +++ b/build/pkgs/rfc3986_validator/checksums.ini @@ -1,5 +1,6 @@ tarball=rfc3986_validator-VERSION-py2.py3-none-any.whl sha1=c0fabd5c0568cc516f9258f3e5846a04a059dc31 +sha256=2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9 md5=41aef4395cd3d560c96a3992534dfd53 cksum=1606077510 upstream_url=https://pypi.io/packages/py2.py3/r/rfc3986_validator/rfc3986_validator-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/rpy2/checksums.ini b/build/pkgs/rpy2/checksums.ini index ece539eec53..5aaa662d045 100644 --- a/build/pkgs/rpy2/checksums.ini +++ b/build/pkgs/rpy2/checksums.ini @@ -1,5 +1,6 @@ tarball=rpy2-VERSION.tar.gz sha1=7d236c0c6982333b20b6a126f0c17a5481fea64b +sha256=5d31a5ea43f5a59f6dec30faca87edb01fc9b8affa0beae96a99be923bd7dab3 md5=8842b153925a2eca21e2552e964facbb cksum=1249008138 upstream_url=https://pypi.io/packages/source/r/rpy2/rpy2-VERSION.tar.gz diff --git a/build/pkgs/rst2ipynb/checksums.ini b/build/pkgs/rst2ipynb/checksums.ini index de9e93fce3f..6a7cf3ed302 100644 --- a/build/pkgs/rst2ipynb/checksums.ini +++ b/build/pkgs/rst2ipynb/checksums.ini @@ -1,5 +1,6 @@ tarball=rst2ipynb-VERSION.tar.gz sha1=98926df9a8336c8974f446a2a858458495b5aec4 +sha256=30d70b0e96f1c37baad9c8dbe904fc2567354eec02c52b94e7c7287b6268eaa3 md5=eedfb3d5b8634e36b680ad86771cec38 cksum=3973650989 upstream_url=https://pypi.io/packages/source/r/rst2ipynb/rst2ipynb-VERSION.tar.gz diff --git a/build/pkgs/rubiks/checksums.ini b/build/pkgs/rubiks/checksums.ini index 35c77e8ff4b..772646b9312 100644 --- a/build/pkgs/rubiks/checksums.ini +++ b/build/pkgs/rubiks/checksums.ini @@ -1,5 +1,6 @@ tarball=rubiks-VERSION-unix.tar.bz2 sha1=c12069ed1eb0fc19f80a474b1c4bad2d845f5e40 +sha256=aae4c88c0f1cf84718c1a6e31e027a2886e9eaea65051385339fd98be8693e07 md5=c1108799440f7f974e55ef967ae6642a cksum=215946372 upstream_url=https://users.ox.ac.uk/~coml0531/tmp/rubiks-VERSION-unix.tar.bz2 diff --git a/build/pkgs/rw/checksums.ini b/build/pkgs/rw/checksums.ini index eaf5817e53c..78c10c711e4 100644 --- a/build/pkgs/rw/checksums.ini +++ b/build/pkgs/rw/checksums.ini @@ -1,5 +1,6 @@ tarball=rw-VERSION.tar.gz sha1=5c9c8a5c2eda798f6b0fe5218ba08ef429e0aa9f +sha256=c1e03506fe25cdfcb428c051fc56b2d2affb5b06fba3f2ce756631466befb441 md5=829612ea322d64bc529ffbb6be42d97e cksum=93091513 upstream_url=https://sourceforge.net/projects/rankwidth/files/rw-VERSION.tar.gz diff --git a/build/pkgs/saclib/checksums.ini b/build/pkgs/saclib/checksums.ini index 1f0289be1e8..6b1f49754c1 100644 --- a/build/pkgs/saclib/checksums.ini +++ b/build/pkgs/saclib/checksums.ini @@ -1,5 +1,6 @@ tarball=saclibVERSION.tar.gz sha1=6f37da451e1003b381e8a9dd7f60ec265021d061 +sha256=e8e3acb253c64394f35c8e17942f764cae34df731f3fe3d749b6a2ae1fb8203b md5=2a251651bc96a14eba4300f18ec4cbb4 cksum=3062086094 upstream_url=https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/saclibVERSION.tgz diff --git a/build/pkgs/sage_numerical_backends_coin/checksums.ini b/build/pkgs/sage_numerical_backends_coin/checksums.ini index 3e33bd4feec..d003d483bf0 100644 --- a/build/pkgs/sage_numerical_backends_coin/checksums.ini +++ b/build/pkgs/sage_numerical_backends_coin/checksums.ini @@ -1,5 +1,6 @@ tarball=sage_numerical_backends_coin-VERSION.tar.gz sha1=5c9708603564c55fa5fddf66ac06f68f4c6145e2 +sha256=d48b7c550bc727f58ce28c03cc572f37e7e6267a0c73366aa6cf852c80af6a39 md5=94ed7c290defc4bf16dcdb0e0c67ca35 cksum=2355301440 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_coin/sage_numerical_backends_coin-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_cplex/checksums.ini b/build/pkgs/sage_numerical_backends_cplex/checksums.ini index 498a4464973..427419e0ca8 100644 --- a/build/pkgs/sage_numerical_backends_cplex/checksums.ini +++ b/build/pkgs/sage_numerical_backends_cplex/checksums.ini @@ -1,5 +1,6 @@ tarball=sage_numerical_backends_cplex-VERSION.tar.gz sha1=59b5f344f5b3d2e1f2fb7dcddef208bcc99e710a +sha256=4e4ce4464a26d1c0bb340273f0731f75b037550dc35afd143e95b94168f2eca1 md5=f8dcd101092634dac83097a36d64c872 cksum=2646359461 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_cplex/sage_numerical_backends_cplex-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini index d5e6fd8e2b1..e1527e84d2c 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini +++ b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini @@ -1,5 +1,6 @@ tarball=sage_numerical_backends_gurobi-VERSION.tar.gz sha1=36a2bfa1cfa2f4fdcb9dc979e80177580bb7aac2 +sha256=bb073ce2d7972aabafd2a074c46231204fe3a04d273b247ee9a03ca8938d17e0 md5=0a77377fad705950c4b7b14b366ebaa6 cksum=478792673 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_gurobi/sage_numerical_backends_gurobi-VERSION.tar.gz diff --git a/build/pkgs/sagenb_export/checksums.ini b/build/pkgs/sagenb_export/checksums.ini index e7a10e0c0cd..1f0cac4ef17 100644 --- a/build/pkgs/sagenb_export/checksums.ini +++ b/build/pkgs/sagenb_export/checksums.ini @@ -1,4 +1,5 @@ tarball=sagenb_export-VERSION.tar.gz sha1=98d268fd21200482299b66196028d55dec923466 +sha256=b642321ccd94da4d04afa12f33b6cea7c8db289f3283c6e39b3a50131780bb5a md5=2f88a08db0d5dd39a9a27eec4cf16192 cksum=607250687 diff --git a/build/pkgs/sagetex/checksums.ini b/build/pkgs/sagetex/checksums.ini index ec20a91fb3d..fef7fdede50 100644 --- a/build/pkgs/sagetex/checksums.ini +++ b/build/pkgs/sagetex/checksums.ini @@ -1,5 +1,6 @@ tarball=sagetex-VERSION.tar.gz sha1=821c8a6ab11ee651d0dcc599c5582fefb6706775 +sha256=03162ec62cb86da13a747f982241af3e4f4cdd4d29fcba8fbb6c6982a9e906d9 md5=a7ddbe41ea3d816e839ddda3ec28f89a cksum=1768053059 upstream_url=https://pypi.io/packages/source/s/sagetex/sagetex-VERSION.tar.gz diff --git a/build/pkgs/scs/checksums.ini b/build/pkgs/scs/checksums.ini index 572dded9919..06fd33b6851 100644 --- a/build/pkgs/scs/checksums.ini +++ b/build/pkgs/scs/checksums.ini @@ -1,5 +1,6 @@ tarball=scs-VERSION.tar.gz sha1=92e4ff21b450c9659f610064eb79e804de9167b4 +sha256=e3bd779e7e977e3ae5a2f2035aa4c2a309e29082d59a722d5d6592edc4bdb4b3 md5=dc86b5ed0a0a22453bb88feacf31539a cksum=4083736723 upstream_url=https://pypi.io/packages/source/s/scs/scs-VERSION.tar.gz diff --git a/build/pkgs/send2trash/checksums.ini b/build/pkgs/send2trash/checksums.ini index 1b16811d046..19cd8b13542 100644 --- a/build/pkgs/send2trash/checksums.ini +++ b/build/pkgs/send2trash/checksums.ini @@ -1,5 +1,6 @@ tarball=Send2Trash-VERSION.tar.gz sha1=211092dcefa5468582f7d083472ad7f1880cc019 +sha256=c132d59fa44b9ca2b1699af5c86f57ce9f4c5eb56629d5d55fbb7a35f84e2312 md5=3fc7ff801bc76da65cf4e97d6b89025e cksum=3017010359 upstream_url=https://pypi.io/packages/source/s/send2trash/Send2Trash-VERSION.tar.gz diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index 1a88d2a7464..70f4231f73b 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,5 +1,6 @@ tarball=setuptools-VERSION-py3-none-any.whl sha1=4227225bb193e3a45542f45966caf777d4c913e8 +sha256=1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2 md5=f096ed836f4036a11aa277fa16dc09ff cksum=263664173 upstream_url=https://pypi.io/packages/py3/s/setuptools/setuptools-VERSION-py3-none-any.whl diff --git a/build/pkgs/setuptools_scm/checksums.ini b/build/pkgs/setuptools_scm/checksums.ini index fd10a17aea2..2781aafd872 100644 --- a/build/pkgs/setuptools_scm/checksums.ini +++ b/build/pkgs/setuptools_scm/checksums.ini @@ -1,5 +1,6 @@ tarball=setuptools_scm-VERSION-py3-none-any.whl sha1=cfde7254fe351b69cd4bf02e1b57e0b3c59aa9a6 +sha256=b47844cd2a84b83b3187a5782c71128c28b4c94cad8bfb871da2784a5cb54c4f md5=4c054a609965886703ede26a4ba3206d cksum=1360813947 upstream_url=https://pypi.io/packages/py3/s/setuptools_scm/setuptools_scm-VERSION-py3-none-any.whl diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini index 40ba7b3153f..4ed707a0728 100644 --- a/build/pkgs/singular/checksums.ini +++ b/build/pkgs/singular/checksums.ini @@ -1,5 +1,6 @@ tarball=singular-VERSION.tar.gz sha1=0dd736f26935ed72999bb9a4bbb98c6df18ab9ea +sha256=8f157d2c582614482285838345ed7a3629ad6dd0bfbbc16eed7cbee0ff69d072 md5=0f9368193bad9a0c3dc84545b2404761 cksum=1698641648 upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-2/singular-VERSION.tar.gz diff --git a/build/pkgs/singular_jupyter/checksums.ini b/build/pkgs/singular_jupyter/checksums.ini index 7def85d733f..299b5dbfb32 100644 --- a/build/pkgs/singular_jupyter/checksums.ini +++ b/build/pkgs/singular_jupyter/checksums.ini @@ -1,4 +1,5 @@ tarball=jupyter_kernel_singular-VERSION.tar.gz sha1=e10d0894cac9ee111e34c6d6d6e409b26edf108f +sha256=1cf81f2a166b548e49ebd6a7623f7fb6d618dc0ab08d28867ee60cc2c4a30d5a md5=c2acfe07c1094200dac521d2e8dcb2a9 cksum=970360836 diff --git a/build/pkgs/sirocco/checksums.ini b/build/pkgs/sirocco/checksums.ini index 2f0181ec823..43dd8cbb90c 100644 --- a/build/pkgs/sirocco/checksums.ini +++ b/build/pkgs/sirocco/checksums.ini @@ -1,5 +1,6 @@ tarball=libsirocco-VERSION.tar.gz sha1=23311c0944f0c128b493589c1575476cf88177b6 +sha256=e86c9fe3b1f2cf0d3a7381d21c1fc4670f14b538c60c7cc6410ccb0f5b1fbaf8 md5=e86b1dc9b72aee0d80186be7f49c295e cksum=784051898 upstream_url=https://github.com/miguelmarco/SIROCCO2/releases/download/VERSION/libsirocco-VERSION.tar.gz diff --git a/build/pkgs/six/checksums.ini b/build/pkgs/six/checksums.ini index a0614f6049b..c768cb3e003 100644 --- a/build/pkgs/six/checksums.ini +++ b/build/pkgs/six/checksums.ini @@ -1,5 +1,6 @@ tarball=six-VERSION-py2.py3-none-any.whl sha1=79e6f2e4f9e24898f1896df379871b9c9922f147 +sha256=8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 md5=529d7fd7e14612ccde86417b4402d6f3 cksum=2975792266 upstream_url=https://pypi.io/packages/py2.py3/s/six/six-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/sniffio/checksums.ini b/build/pkgs/sniffio/checksums.ini index d8475bc91d3..b1fea86cf15 100644 --- a/build/pkgs/sniffio/checksums.ini +++ b/build/pkgs/sniffio/checksums.ini @@ -1,5 +1,6 @@ tarball=sniffio-VERSION-py3-none-any.whl sha1=16f883fd7e31aa383df8901002f9ce5cec7606e5 +sha256=eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384 md5=7890655ffc549d04087bbc2f93332034 cksum=2528943486 upstream_url=https://pypi.io/packages/py3/s/sniffio/sniffio-VERSION-py3-none-any.whl diff --git a/build/pkgs/snowballstemmer/checksums.ini b/build/pkgs/snowballstemmer/checksums.ini index dcc56ed9ed4..76d580c6dcc 100644 --- a/build/pkgs/snowballstemmer/checksums.ini +++ b/build/pkgs/snowballstemmer/checksums.ini @@ -1,5 +1,6 @@ tarball=snowballstemmer-VERSION.tar.gz sha1=aaf1b0e3b58d25e2e297ea3dbef59d8534ef8d92 +sha256=09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 md5=4332ddc7bbee0f344a03915b2ad59a54 cksum=3477609484 upstream_url=https://pypi.io/packages/source/s/snowballstemmer/snowballstemmer-VERSION.tar.gz diff --git a/build/pkgs/soupsieve/checksums.ini b/build/pkgs/soupsieve/checksums.ini index df73b2d47ba..015cc6d527a 100644 --- a/build/pkgs/soupsieve/checksums.ini +++ b/build/pkgs/soupsieve/checksums.ini @@ -1,5 +1,6 @@ tarball=soupsieve-VERSION-py3-none-any.whl sha1=a155a6208211aa90bbc3bcfc9cab194a05000e59 +sha256=eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7 md5=80ebff671b2b8a346c2922b1feebf995 cksum=275705301 upstream_url=https://pypi.io/packages/py3/s/soupsieve/soupsieve-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index c1741587efb..666748415f7 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinx-VERSION-py3-none-any.whl sha1=d4155cf2dbd768db9431fddcb7f53dd67caf56e1 +sha256=1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560 md5=35ced785936bf05d6b2769a797b15adf cksum=1007986807 upstream_url=https://pypi.io/packages/py3/s/sphinx/sphinx-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_basic_ng/checksums.ini b/build/pkgs/sphinx_basic_ng/checksums.ini index 7c1f69fc872..3ebf6672603 100644 --- a/build/pkgs/sphinx_basic_ng/checksums.ini +++ b/build/pkgs/sphinx_basic_ng/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinx_basic_ng-VERSION-py3-none-any.whl sha1=abcd9bda6ae61bb20c52bf46c17fb1bbdfdab4ea +sha256=eb09aedbabfb650607e9b4b68c9d240b90b1e1be221d6ad71d61c52e29f7932b md5=39e1f6e303b3b485200b11abe9a5d552 cksum=1539165518 upstream_url=https://pypi.io/packages/py3/s/sphinx_basic_ng/sphinx_basic_ng-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_copybutton/checksums.ini b/build/pkgs/sphinx_copybutton/checksums.ini index faf4fc2e45d..05dacda0f75 100644 --- a/build/pkgs/sphinx_copybutton/checksums.ini +++ b/build/pkgs/sphinx_copybutton/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinx_copybutton-VERSION-py3-none-any.whl sha1=a15e038b665225b13f7bd3eae6a2a64c8bd4b582 +sha256=fb543fd386d917746c9a2c50360c7905b605726b9355cd26e9974857afeae06e md5=6781b8e0c3f77c146776b07ab345402a cksum=1069247069 upstream_url=https://pypi.io/packages/py3/s/sphinx_copybutton/sphinx_copybutton-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_inline_tabs/checksums.ini b/build/pkgs/sphinx_inline_tabs/checksums.ini index f8423958dd5..31e4fb8f30c 100644 --- a/build/pkgs/sphinx_inline_tabs/checksums.ini +++ b/build/pkgs/sphinx_inline_tabs/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinx_inline_tabs-VERSION-py3-none-any.whl sha1=1404e320d0533280355e7e1e71cffd9937015027 +sha256=06809ac613f7c48ddd6e2fa588413e3fe92cff2397b56e2ccf0b0218f9ef6a78 md5=7373d0ebd34be8f9ac2ed62bc63f4582 cksum=2708358042 upstream_url=https://pypi.io/packages/py3/s/sphinx_inline_tabs/sphinx_inline_tabs-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_applehelp/checksums.ini b/build/pkgs/sphinxcontrib_applehelp/checksums.ini index f3bd0dc0b95..480a910b715 100644 --- a/build/pkgs/sphinxcontrib_applehelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_applehelp/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_applehelp-VERSION-py3-none-any.whl sha1=e426527562da2c5c520b27c58210cd1d44a1185b +sha256=cb61eb0ec1b61f349e5cc36b2028e9e7ca765be05e49641c97241274753067b4 md5=2d4ea0fe463afb95f8c2ef125587934a cksum=3631877161 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_applehelp/sphinxcontrib_applehelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_devhelp/checksums.ini b/build/pkgs/sphinxcontrib_devhelp/checksums.ini index 865c81de2b9..c9c24b226b1 100644 --- a/build/pkgs/sphinxcontrib_devhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_devhelp/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_devhelp-VERSION-py3-none-any.whl sha1=c1c774393d267d97eaf07f0e5c740f82af24d628 +sha256=6485d09629944511c893fa11355bda18b742b83a2b181f9a009f7e500595c90f md5=961a181d10d6d062ddaf5ed9321871f8 cksum=1442746149 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_devhelp/sphinxcontrib_devhelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini index 28acb5af66f..ce56c1f15e3 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_htmlhelp-VERSION-py3-none-any.whl sha1=6b60c617a0fe98a663ca146edc03867581da5e07 +sha256=393f04f112b4d2f53d93448d4bce35842f62b307ccdc549ec1585e950bc35e04 md5=69b417211acf45aef9512adc660623c5 cksum=3983023906 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_htmlhelp/sphinxcontrib_htmlhelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_jsmath/checksums.ini b/build/pkgs/sphinxcontrib_jsmath/checksums.ini index 87b533edaf2..f1fd08665c6 100644 --- a/build/pkgs/sphinxcontrib_jsmath/checksums.ini +++ b/build/pkgs/sphinxcontrib_jsmath/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_jsmath-VERSION-py2.py3-none-any.whl sha1=beff4fc35d13a5f2883bc129f28ac031046195c5 +sha256=2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178 md5=4a9dbd97819fa713147472387ebd845d cksum=747406250 upstream_url=https://pypi.io/packages/py2.py3/s/sphinxcontrib_jsmath/sphinxcontrib_jsmath-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_qthelp/checksums.ini b/build/pkgs/sphinxcontrib_qthelp/checksums.ini index c47e8a51079..ed38f599d94 100644 --- a/build/pkgs/sphinxcontrib_qthelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_qthelp/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_qthelp-VERSION-py3-none-any.whl sha1=8f593bd6ca46487ed25ee0fca50f0d88b18e5f9e +sha256=e2ae3b5c492d58fcbd73281fbd27e34b8393ec34a073c792642cd8e529288182 md5=3d3730f8492cffc8394868adad27e378 cksum=1687408767 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_qthelp/sphinxcontrib_qthelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini index 94e0addaab8..d70f00e6278 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini +++ b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_serializinghtml-VERSION-py3-none-any.whl sha1=a5198a72d1668e97fdda39a559586bcf57cb7278 +sha256=326369b8df80a7d2d8d7f99aa5ac577f51ea51556ed974e7716cfd4fca3f6cb7 md5=2c757ab993b2dd53bf3246188e2b37ad cksum=1878315415 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_serializinghtml/sphinxcontrib_serializinghtml-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_websupport/checksums.ini b/build/pkgs/sphinxcontrib_websupport/checksums.ini index ef1421c9146..4c29f251731 100644 --- a/build/pkgs/sphinxcontrib_websupport/checksums.ini +++ b/build/pkgs/sphinxcontrib_websupport/checksums.ini @@ -1,5 +1,6 @@ tarball=sphinxcontrib_websupport-VERSION-py3-none-any.whl sha1=649d1447a4773b665588060efda66344cb9b99a5 +sha256=2dc179d7f821ebd54f31f93c894ca52435ebc5364e4e4dfb0da834ac119d51fd md5=472e9b717e65a1c130bc02696b6801f8 cksum=906870632 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_websupport/sphinxcontrib_websupport-VERSION-py3-none-any.whl diff --git a/build/pkgs/sqlite/checksums.ini b/build/pkgs/sqlite/checksums.ini index 777aa3953a3..f23bd2d117a 100644 --- a/build/pkgs/sqlite/checksums.ini +++ b/build/pkgs/sqlite/checksums.ini @@ -1,5 +1,6 @@ tarball=sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz sha1=a4bcf9e951bfb9745214241ba08476299fc2dc1e +sha256=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 md5=f5752052fc5b8e1b539af86a3671eac7 cksum=763219165 upstream_url=https://www.sqlite.org/2021/sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz diff --git a/build/pkgs/stack_data/checksums.ini b/build/pkgs/stack_data/checksums.ini index f86f44c1587..d1f425ef43b 100644 --- a/build/pkgs/stack_data/checksums.ini +++ b/build/pkgs/stack_data/checksums.ini @@ -1,5 +1,6 @@ tarball=stack_data-VERSION.tar.gz sha1=7f7627afc47570ffb06924c1b2fbb48e21bac724 +sha256=836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9 md5=d04f7cda6589138e90691aec1edbf0d5 cksum=4043168585 upstream_url=https://pypi.io/packages/source/s/stack_data/stack_data-VERSION.tar.gz diff --git a/build/pkgs/suitesparse/checksums.ini b/build/pkgs/suitesparse/checksums.ini index fa6fbb6f9a4..26b3db1fd07 100644 --- a/build/pkgs/suitesparse/checksums.ini +++ b/build/pkgs/suitesparse/checksums.ini @@ -1,5 +1,6 @@ tarball=SuiteSparse-VERSION.tar.gz sha1=83dd96b32701e12b7577acb7d9aea80138d7e46e +sha256=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee md5=68bb912f3cf3d2b01f30ebafef690302 cksum=178881779 upstream_url=https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/surf/checksums.ini b/build/pkgs/surf/checksums.ini index 8d9fde8d4f7..d3fea89dc8e 100644 --- a/build/pkgs/surf/checksums.ini +++ b/build/pkgs/surf/checksums.ini @@ -1,4 +1,5 @@ tarball=surf-VERSION.tar.gz sha1=570dc2ab09619a907d2f6a142b0d268082cfc003 +sha256=f5e4c78c4c9c8b70e7aee2471db4b006eed2e0bd4afc0c19e3801a42c2c0a370 md5=ca1a57804cc6efc7d14f285d54119b33 cksum=2431066768 diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 9ba59940a9f..88d92243d88 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,6 +1,6 @@ tarball=symengine-VERSION.tar.gz sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f +sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd md5=4074f3c76570bdc2ae9914edafa29eb6 cksum=3782541135 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz - diff --git a/build/pkgs/symmetrica/checksums.ini b/build/pkgs/symmetrica/checksums.ini index 6d06ebda462..afee6180891 100644 --- a/build/pkgs/symmetrica/checksums.ini +++ b/build/pkgs/symmetrica/checksums.ini @@ -1,5 +1,6 @@ tarball=symmetrica-VERSION.tar.xz sha1=0044cc087ff04267c246e730c6570d89f6e593af +sha256=05ae107ec41f38cada19c26b6d7884970cbafae6e3b55ec3964896230358b456 md5=cd4716c26b5c625a012c22656113ef6f cksum=1186250347 upstream_url=http://users.ox.ac.uk/~coml0531/sage/symmetrica-VERSION.tar.xz diff --git a/build/pkgs/sympow/checksums.ini b/build/pkgs/sympow/checksums.ini index 87bf0086178..d1fb79e008e 100644 --- a/build/pkgs/sympow/checksums.ini +++ b/build/pkgs/sympow/checksums.ini @@ -1,5 +1,6 @@ tarball=sympow-vVERSION.tar.gz sha1=37a909c26009415197b5088a2f1b53dd3558f494 +sha256=53631afa6c68dd008400681af0fe1d60ada36716215449f2a668853ed04455ac md5=51f2c717c84ec9c2840af740751cf797 cksum=1444149964 upstream_url=https://github.com/mkoeppe/sympow/releases/download/vVERSION/sympow-vVERSION.tar.gz diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini index 72ea62bb91f..a1fb95f04ed 100644 --- a/build/pkgs/sympy/checksums.ini +++ b/build/pkgs/sympy/checksums.ini @@ -1,5 +1,6 @@ tarball=sympy-VERSION.tar.gz sha1=604968f191e2d69053b8310066d089f73a1bd109 +sha256=ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8 md5=3e0033109352d7303ea97b9216e16645 cksum=2437095035 upstream_url=https://github.com/sympy/sympy/releases/download/sympy-VERSION/sympy-VERSION.tar.gz diff --git a/build/pkgs/tachyon/checksums.ini b/build/pkgs/tachyon/checksums.ini index 0300429a939..f63a83f22ab 100644 --- a/build/pkgs/tachyon/checksums.ini +++ b/build/pkgs/tachyon/checksums.ini @@ -1,4 +1,5 @@ tarball=tachyon-VERSION.tar.bz2 sha1=9866dc93e129115994708efa6e7ca16e20d58237 +sha256=e8888a410610e2726dca32f40f31ff34a83cb474b41e5a1e0ac8bbb175e1a466 md5=fac22f4a5f675229bcc14264af4e7b81 cksum=3876215200 diff --git a/build/pkgs/tdlib/checksums.ini b/build/pkgs/tdlib/checksums.ini index 7f557c54f86..b2da7907fab 100644 --- a/build/pkgs/tdlib/checksums.ini +++ b/build/pkgs/tdlib/checksums.ini @@ -1,4 +1,5 @@ tarball=tdlib-VERSION.tar.gz sha1=8e200d0e3ac009030f3ada6658d20717e433220f +sha256=5a40375e738e9e6dbd37f53e54deb1efa6b58f154d83b7bfeaee9f47d47b444b md5=6bd9e7d9dae616079d511658f70eff73 cksum=2382384273 diff --git a/build/pkgs/terminado/checksums.ini b/build/pkgs/terminado/checksums.ini index be9b273fa2b..e68458b878d 100644 --- a/build/pkgs/terminado/checksums.ini +++ b/build/pkgs/terminado/checksums.ini @@ -1,5 +1,6 @@ tarball=terminado-VERSION.tar.gz sha1=608fcc44b845e1fb783e361d59e79fba83126e14 +sha256=6ccbbcd3a4f8a25a5ec04991f39a0b8db52dfcd487ea0e578d977e6752380333 md5=aafcc42623986e42469712786edb127c cksum=3344744872 upstream_url=https://pypi.io/packages/source/t/terminado/terminado-VERSION.tar.gz diff --git a/build/pkgs/texttable/checksums.ini b/build/pkgs/texttable/checksums.ini index d8725b785b2..78205601114 100644 --- a/build/pkgs/texttable/checksums.ini +++ b/build/pkgs/texttable/checksums.ini @@ -1,5 +1,6 @@ tarball=texttable-VERSION.tar.gz sha1=0fa175fa6e0fefea31434746641bedc8cbb60248 +sha256=2d2068fb55115807d3ac77a4ca68fa48803e84ebb0ee2340f858107a36522638 md5=e5d380c04fab132ccf0bbfd4f761bd51 cksum=274394355 upstream_url=https://pypi.io/packages/source/t/texttable/texttable-VERSION.tar.gz diff --git a/build/pkgs/threejs/checksums.ini b/build/pkgs/threejs/checksums.ini index 8fd18f13afd..bd918595ed2 100644 --- a/build/pkgs/threejs/checksums.ini +++ b/build/pkgs/threejs/checksums.ini @@ -1,5 +1,6 @@ tarball=threejs-sage-VERSION.tar.gz sha1=db7910b25fe9df7849528cffd06f2a40a90c82c0 +sha256=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8 md5=ba8faf405988e066d8ce7e176f3624f2 cksum=2491453519 upstream_url=https://github.com/sagemath/threejs-sage/archive/VERSION.tar.gz diff --git a/build/pkgs/tides/checksums.ini b/build/pkgs/tides/checksums.ini index f75423db3a7..7bc12bec45f 100644 --- a/build/pkgs/tides/checksums.ini +++ b/build/pkgs/tides/checksums.ini @@ -1,4 +1,5 @@ tarball=tides-VERSION.tar.gz sha1=2a70d8e08c364abff3314b9f15022aba2b62c1e7 +sha256=9ba5490f7c22f7a56f23d29dcb314df9811bd82dd21d5e19b3cca5a9d86d919a md5=200db1104c40f0c4f7bce806c773c87f cksum=2240108013 diff --git a/build/pkgs/tinycss2/checksums.ini b/build/pkgs/tinycss2/checksums.ini index c905e293396..94a7ec7c747 100644 --- a/build/pkgs/tinycss2/checksums.ini +++ b/build/pkgs/tinycss2/checksums.ini @@ -1,5 +1,6 @@ tarball=tinycss2-VERSION.tar.gz sha1=3871ffec30bde346d1a17f80a423dce488bad4f7 +sha256=8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627 md5=e8a06102e7f42ca791463f11ce7b814d cksum=1840765267 upstream_url=https://pypi.io/packages/source/t/tinycss2/tinycss2-VERSION.tar.gz diff --git a/build/pkgs/tomli/checksums.ini b/build/pkgs/tomli/checksums.ini index f2edcb641cb..ae98bbacaa6 100644 --- a/build/pkgs/tomli/checksums.ini +++ b/build/pkgs/tomli/checksums.ini @@ -1,5 +1,6 @@ tarball=tomli-VERSION-py3-none-any.whl sha1=5bfc83c14bc54e6193a0d50a50c16a88eda0c4fa +sha256=939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc md5=a8a774971c6d046cf1c87cd801dd158f cksum=891457836 upstream_url=https://pypi.io/packages/py3/t/tomli/tomli-VERSION-py3-none-any.whl diff --git a/build/pkgs/topcom/checksums.ini b/build/pkgs/topcom/checksums.ini index 764c422b5ac..4b0aca4660c 100644 --- a/build/pkgs/topcom/checksums.ini +++ b/build/pkgs/topcom/checksums.ini @@ -1,5 +1,6 @@ tarball=TOPCOM-1_1_2.tgz sha1=65db8c00309f3bf8467ee5ba9da109c196db3461 +sha256=4fb10754ee5b76056441fea98f2c8dee5db6f2984d8c14283b49239ad4378ab6 md5=dbda1ae7946251c9502444ee9b0a2c62 cksum=1598684291 upstream_url=https://users.ox.ac.uk/~coml0531/tmp/TOPCOM-1_1_2.tgz diff --git a/build/pkgs/tornado/checksums.ini b/build/pkgs/tornado/checksums.ini index 08508eba5d2..de0fb6fbe18 100644 --- a/build/pkgs/tornado/checksums.ini +++ b/build/pkgs/tornado/checksums.ini @@ -1,5 +1,6 @@ tarball=tornado-VERSION.tar.gz sha1=5b4036313660a74034186ac63b10d244ca9444b8 +sha256=72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee md5=460b467761e5ff74202b5bf8054c8116 cksum=3932629794 upstream_url=https://pypi.io/packages/source/t/tornado/tornado-VERSION.tar.gz diff --git a/build/pkgs/tox/checksums.ini b/build/pkgs/tox/checksums.ini index caf44efe123..573419f6dfc 100644 --- a/build/pkgs/tox/checksums.ini +++ b/build/pkgs/tox/checksums.ini @@ -1,5 +1,6 @@ tarball=tox-VERSION-py3-none-any.whl sha1=d3312285c4988d3307d3b000a8a18cfcb16aea29 +sha256=da761b4a57ee2b92b5ce39f48ff723fc42d185bf2af508effb683214efa662ea md5=127a9d3fae61a0967f14ab6d59fd118f cksum=4147794288 upstream_url=https://pypi.io/packages/py3/t/tox/tox-VERSION-py3-none-any.whl diff --git a/build/pkgs/traitlets/checksums.ini b/build/pkgs/traitlets/checksums.ini index 711eb90d8f5..50752896807 100644 --- a/build/pkgs/traitlets/checksums.ini +++ b/build/pkgs/traitlets/checksums.ini @@ -1,5 +1,6 @@ tarball=traitlets-VERSION.tar.gz sha1=9f4cb2a04ffba7029ad67bbec3d39a23e9095db2 +sha256=fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772 md5=63c6bb056dec2a062a854d90fa6b4933 cksum=2387245107 upstream_url=https://pypi.io/packages/source/t/traitlets/traitlets-VERSION.tar.gz diff --git a/build/pkgs/trove_classifiers/checksums.ini b/build/pkgs/trove_classifiers/checksums.ini index 7350f444667..be28f5e562f 100644 --- a/build/pkgs/trove_classifiers/checksums.ini +++ b/build/pkgs/trove_classifiers/checksums.ini @@ -1,5 +1,6 @@ tarball=trove_classifiers-VERSION-py3-none-any.whl sha1=c341abee77b5c87d913b86dc587e544553f0658c +sha256=02307750cbbac2b3d13078662f8a5bf077732bf506e9c33c97204b7f68f3699e md5=78e67f128f53b8417134429192810701 cksum=3034057088 upstream_url=https://pypi.io/packages/py3/t/trove_classifiers/trove_classifiers-VERSION-py3-none-any.whl diff --git a/build/pkgs/types_python_dateutil/checksums.ini b/build/pkgs/types_python_dateutil/checksums.ini index f0dc860781b..1ba54d11802 100644 --- a/build/pkgs/types_python_dateutil/checksums.ini +++ b/build/pkgs/types_python_dateutil/checksums.ini @@ -1,5 +1,6 @@ tarball=types_python_dateutil-VERSION-py3-none-any.whl sha1=c039b93ad4b5f3ea1c6aac3d08386995e8c7b19e +sha256=f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9 md5=6281a2b67e2347366238ef28e3f8a070 cksum=1399426019 upstream_url=https://pypi.io/packages/py3/t/types_python_dateutil/types_python_dateutil-VERSION-py3-none-any.whl diff --git a/build/pkgs/typing_extensions/checksums.ini b/build/pkgs/typing_extensions/checksums.ini index babfa059d5c..4d9609b3641 100644 --- a/build/pkgs/typing_extensions/checksums.ini +++ b/build/pkgs/typing_extensions/checksums.ini @@ -1,5 +1,6 @@ tarball=typing_extensions-VERSION-py3-none-any.whl sha1=84d6a73b5a5d303c9187a861d5eedd50da42e7a3 +sha256=8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 md5=9c84e613da80ced7a5e86329ec75dc6c cksum=2951292774 upstream_url=https://pypi.io/packages/py3/t/typing_extensions/typing_extensions-VERSION-py3-none-any.whl diff --git a/build/pkgs/tzdata/checksums.ini b/build/pkgs/tzdata/checksums.ini index 342e71f3761..c5cb8ec1498 100644 --- a/build/pkgs/tzdata/checksums.ini +++ b/build/pkgs/tzdata/checksums.ini @@ -1,5 +1,6 @@ tarball=tzdata-VERSION-py2.py3-none-any.whl sha1=4686c7c91a01d5af9075903937c343afa05c141b +sha256=7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda md5=5e534124c0c916ab617421247649b193 cksum=2929397850 upstream_url=https://pypi.io/packages/py2.py3/t/tzdata/tzdata-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/tzlocal/checksums.ini b/build/pkgs/tzlocal/checksums.ini index eb9533b0f63..74e426ab48c 100644 --- a/build/pkgs/tzlocal/checksums.ini +++ b/build/pkgs/tzlocal/checksums.ini @@ -1,5 +1,6 @@ tarball=tzlocal-VERSION.tar.gz sha1=1d61e52edddf882c9af4f5f3f1be0db3788dd7b5 +sha256=46eb99ad4bdb71f3f72b7d24f4267753e240944ecfc16f25d2719ba89827a803 md5=c209a72fd296ff6e1a98d55c2382ba79 cksum=1644259932 upstream_url=https://pypi.io/packages/source/t/tzlocal/tzlocal-VERSION.tar.gz diff --git a/build/pkgs/uri_template/checksums.ini b/build/pkgs/uri_template/checksums.ini index cdcfc0caeaa..d167dffc8ce 100644 --- a/build/pkgs/uri_template/checksums.ini +++ b/build/pkgs/uri_template/checksums.ini @@ -1,5 +1,6 @@ tarball=uri_template-VERSION-py3-none-any.whl sha1=bbc8808bdb7e687f0c099c8120cd901dc90bce69 +sha256=a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363 md5=7d7f28c2ffd7d4746174ab761f6025e5 cksum=1943559906 upstream_url=https://pypi.io/packages/py3/u/uri_template/uri_template-VERSION-py3-none-any.whl diff --git a/build/pkgs/urllib3/checksums.ini b/build/pkgs/urllib3/checksums.ini index 6967bd9a90c..ae276d16d95 100644 --- a/build/pkgs/urllib3/checksums.ini +++ b/build/pkgs/urllib3/checksums.ini @@ -1,5 +1,6 @@ tarball=urllib3-VERSION-py3-none-any.whl sha1=1e197082cd0d0f98bc97f2fbfd7d2a597e3ff3e4 +sha256=55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3 md5=56a1919e2243cc6af59b23c06eda3783 cksum=3597756225 upstream_url=https://pypi.io/packages/py3/u/urllib3/urllib3-VERSION-py3-none-any.whl diff --git a/build/pkgs/valgrind/checksums.ini b/build/pkgs/valgrind/checksums.ini index 242642cedef..086b50d177d 100644 --- a/build/pkgs/valgrind/checksums.ini +++ b/build/pkgs/valgrind/checksums.ini @@ -1,4 +1,5 @@ tarball=valgrind-VERSION.tar.bz2 sha1=182afd405b92ddb6f52c6729e848eacf4b1daf46 +sha256=037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5 md5=74175426afa280184b62591b58c671b3 cksum=2472830850 diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini index 90a2a903926..16b0e6beab2 100644 --- a/build/pkgs/virtualenv/checksums.ini +++ b/build/pkgs/virtualenv/checksums.ini @@ -1,5 +1,6 @@ tarball=virtualenv-VERSION-py3-none-any.whl sha1=9c942063d76d85361f0567b59cce8238c57f1183 +sha256=4238949c5ffe6876362d9c0180fc6c3a824a7b12b80604eeb8085f2ed7460de3 md5=7dec1148d91180767ae908dc49a7ebf5 cksum=3612060825 upstream_url=https://pypi.io/packages/py3/v/virtualenv/virtualenv-VERSION-py3-none-any.whl diff --git a/build/pkgs/wcwidth/checksums.ini b/build/pkgs/wcwidth/checksums.ini index 2745366a726..e0904082ae0 100644 --- a/build/pkgs/wcwidth/checksums.ini +++ b/build/pkgs/wcwidth/checksums.ini @@ -1,5 +1,6 @@ tarball=wcwidth-VERSION.tar.gz sha1=49bdbcac346f31be8201c663082331b693264382 +sha256=f01c104efdf57971bcb756f054dd58ddec5204dd15fa31d6503ea57947d97c02 md5=c37cceb9d573adcce0b3e5167ecb1df9 cksum=68756555 upstream_url=https://pypi.io/packages/source/w/wcwidth/wcwidth-VERSION.tar.gz diff --git a/build/pkgs/webcolors/checksums.ini b/build/pkgs/webcolors/checksums.ini index 4a7e6f5de15..1c577f59530 100644 --- a/build/pkgs/webcolors/checksums.ini +++ b/build/pkgs/webcolors/checksums.ini @@ -1,5 +1,6 @@ tarball=webcolors-VERSION-py3-none-any.whl sha1=e13a9143964b824fc4972b60eddd8115f6839a26 +sha256=29bc7e8752c0a1bd4a1f03c14d6e6a72e93d82193738fa860cbff59d0fcc11bf md5=d9e9ac7c1da7a2b18975265cf0a953ac cksum=371137261 upstream_url=https://pypi.io/packages/py3/w/webcolors/webcolors-VERSION-py3-none-any.whl diff --git a/build/pkgs/webencodings/checksums.ini b/build/pkgs/webencodings/checksums.ini index 1f1d3fd16a4..e8eca28026e 100644 --- a/build/pkgs/webencodings/checksums.ini +++ b/build/pkgs/webencodings/checksums.ini @@ -1,4 +1,5 @@ tarball=webencodings-VERSION.tar.gz sha1=fd870193fde74183c0e1cd43bce01a4a930cd049 +sha256=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 md5=32f6e261d52e57bf7e1c4d41546d15b8 cksum=777885313 diff --git a/build/pkgs/websocket_client/checksums.ini b/build/pkgs/websocket_client/checksums.ini index 5ebee45e9f9..e425fb418e0 100644 --- a/build/pkgs/websocket_client/checksums.ini +++ b/build/pkgs/websocket_client/checksums.ini @@ -1,5 +1,6 @@ tarball=websocket_client-VERSION-py3-none-any.whl sha1=eb78bd39f1ae4d531cc965bd21d121ba3d156f84 +sha256=084072e0a7f5f347ef2ac3d8698a5e0b4ffbfcab607628cadabc650fc9a83a24 md5=bea7b61d0eda66ffb9071c469d937255 cksum=21706746 upstream_url=https://pypi.io/packages/py3/w/websocket_client/websocket_client-VERSION-py3-none-any.whl diff --git a/build/pkgs/wheel/checksums.ini b/build/pkgs/wheel/checksums.ini index 4f2b8c5c534..98c82b8d2fe 100644 --- a/build/pkgs/wheel/checksums.ini +++ b/build/pkgs/wheel/checksums.ini @@ -1,5 +1,6 @@ tarball=wheel-VERSION-py3-none-any.whl sha1=fcf4ad8d5d8216d661bc98eede0d9210cbc5b697 +sha256=177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d md5=779d91395ceb12e15e3a585b30b53f9f cksum=1421399426 upstream_url=https://pypi.io/packages/py3/w/wheel/wheel-VERSION-py3-none-any.whl diff --git a/build/pkgs/widgetsnbextension/checksums.ini b/build/pkgs/widgetsnbextension/checksums.ini index 6c7893d9502..040333d99d1 100644 --- a/build/pkgs/widgetsnbextension/checksums.ini +++ b/build/pkgs/widgetsnbextension/checksums.ini @@ -1,5 +1,6 @@ tarball=widgetsnbextension-VERSION-py3-none-any.whl sha1=067535b5d1738a4de0abb5f1219581a4a66d243c +sha256=91452ca8445beb805792f206e560c1769284267a30ceb1cec9f5bcc887d15175 md5=ac2760673371602f990bb24ac7925c5f cksum=1509404095 upstream_url=https://pypi.io/packages/py3/w/widgetsnbextension/widgetsnbextension-VERSION-py3-none-any.whl diff --git a/build/pkgs/xz/checksums.ini b/build/pkgs/xz/checksums.ini index 6fa58c3a084..b227a9d751b 100644 --- a/build/pkgs/xz/checksums.ini +++ b/build/pkgs/xz/checksums.ini @@ -1,5 +1,6 @@ tarball=xz-VERSION.tar.gz sha1=fa2ae4db119f639a01b02f99f1ba671ece2828eb +sha256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 md5=0d270c997aff29708c74d53f599ef717 cksum=1153713708 upstream_url=https://tukaani.org/xz/xz-VERSION.tar.gz diff --git a/build/pkgs/zeromq/checksums.ini b/build/pkgs/zeromq/checksums.ini index bc7f6b0c8b1..cdabf5ad7dd 100644 --- a/build/pkgs/zeromq/checksums.ini +++ b/build/pkgs/zeromq/checksums.ini @@ -1,5 +1,6 @@ tarball=zeromq-VERSION.tar.gz sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500 +sha256=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 md5=ae933b1e98411fd7cb8309f9502d2737 cksum=1351453048 upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz diff --git a/build/pkgs/zipp/checksums.ini b/build/pkgs/zipp/checksums.ini index 7c9d001b307..cc86b01b70a 100644 --- a/build/pkgs/zipp/checksums.ini +++ b/build/pkgs/zipp/checksums.ini @@ -1,5 +1,6 @@ tarball=zipp-VERSION-py3-none-any.whl sha1=8dd92e1b777b02ec6e1ebe72926d32a82c58b246 +sha256=0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 md5=d93f0b8485000b37800a6de09ed6c1cb cksum=3547254189 upstream_url=https://pypi.io/packages/py3/z/zipp/zipp-VERSION-py3-none-any.whl diff --git a/build/pkgs/zlib/checksums.ini b/build/pkgs/zlib/checksums.ini index 4b1b46adcaa..469a7ef3c9d 100644 --- a/build/pkgs/zlib/checksums.ini +++ b/build/pkgs/zlib/checksums.ini @@ -1,4 +1,5 @@ tarball=zlib-VERSION.tar.gz sha1=e6d119755acdf9104d7ba236b1242696940ed6dd +sha256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 md5=1c9f62f0778697a09d36121ead88e08e cksum=2150653187 diff --git a/build/sage_bootstrap/updater.py b/build/sage_bootstrap/updater.py index 67f1c961124..2debe8373b0 100644 --- a/build/sage_bootstrap/updater.py +++ b/build/sage_bootstrap/updater.py @@ -45,6 +45,7 @@ def checksums_ini(self): result = [ 'tarball=' + self.package.tarball_pattern, 'sha1=' + tarball._compute_sha1(), + 'sha256=' + tarball._compute_sha256(), 'md5=' + tarball._compute_md5(), 'cksum=' + tarball._compute_cksum() ] From d890bd9b18b23647d883b7c780a6ce49c1fefffa Mon Sep 17 00:00:00 2001 From: faisal <71896424+faisalfakhro@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:34:23 +0300 Subject: [PATCH 04/21] remove md5, cksum --- build/pkgs/4ti2/checksums.ini | 2 - build/pkgs/alabaster/checksums.ini | 2 - build/pkgs/anyio/checksums.ini | 2 - build/pkgs/appdirs/checksums.ini | 2 - build/pkgs/appnope/checksums.ini | 2 - build/pkgs/argon2_cffi/checksums.ini | 2 - build/pkgs/argon2_cffi_bindings/checksums.ini | 2 - build/pkgs/arrow/checksums.ini | 2 - build/pkgs/asttokens/checksums.ini | 2 - build/pkgs/async_lru/checksums.ini | 2 - build/pkgs/attrs/checksums.ini | 2 - build/pkgs/awali/checksums.ini | 2 - build/pkgs/babel/checksums.ini | 2 - build/pkgs/barvinok/checksums.ini | 2 - build/pkgs/beautifulsoup4/checksums.ini | 2 - build/pkgs/beniget/checksums.ini | 2 - build/pkgs/benzene/checksums.ini | 2 - build/pkgs/bleach/checksums.ini | 2 - build/pkgs/bliss/checksums.ini | 2 - build/pkgs/boost_cropped/checksums.ini | 2 - build/pkgs/brial/checksums.ini | 2 - build/pkgs/buckygen/checksums.ini | 2 - build/pkgs/bzip2/checksums.ini | 2 - build/pkgs/cachetools/checksums.ini | 2 - build/pkgs/calver/checksums.ini | 2 - build/pkgs/cbc/checksums.ini | 2 - build/pkgs/ccache/checksums.ini | 2 - build/pkgs/cddlib/checksums.ini | 2 - build/pkgs/certifi/checksums.ini | 2 - build/pkgs/cffi/checksums.ini | 2 - build/pkgs/chardet/checksums.ini | 2 - build/pkgs/charset_normalizer/checksums.ini | 2 - build/pkgs/cliquer/checksums.ini | 2 - build/pkgs/cmake/checksums.ini | 2 - build/pkgs/cocoalib/checksums.ini | 2 - build/pkgs/colorama/checksums.ini | 2 - .../pkgs/combinatorial_designs/checksums.ini | 2 - build/pkgs/comm/checksums.ini | 2 - build/pkgs/contourpy/checksums.ini | 2 - build/pkgs/conway_polynomials/checksums.ini | 2 - build/pkgs/coxeter3/checksums.ini | 2 - build/pkgs/cppy/checksums.ini | 2 - build/pkgs/cryptominisat/checksums.ini | 2 - build/pkgs/csdp/checksums.ini | 2 - build/pkgs/cunningham_tables/checksums.ini | 2 - build/pkgs/curl/checksums.ini | 2 - build/pkgs/cvxopt/checksums.ini | 2 - build/pkgs/cvxpy/checksums.ini | 2 - build/pkgs/cycler/checksums.ini | 2 - build/pkgs/cylp/checksums.ini | 2 - build/pkgs/cysignals/checksums.ini | 2 - build/pkgs/cython/checksums.ini | 2 - build/pkgs/d3js/checksums.ini | 2 - .../database_cremona_ellcurve/checksums.ini | 2 - build/pkgs/database_cubic_hecke/checksums.ini | 2 - .../database_jones_numfield/checksums.ini | 2 - build/pkgs/database_knotinfo/checksums.ini | 2 - build/pkgs/database_kohel/checksums.ini | 2 - .../database_mutation_class/checksums.ini | 2 - .../pkgs/database_odlyzko_zeta/checksums.ini | 2 - .../pkgs/database_stein_watkins/checksums.ini | 2 - .../database_stein_watkins_mini/checksums.ini | 2 - .../pkgs/database_symbolic_data/checksums.ini | 2 - build/pkgs/dateutil/checksums.ini | 2 - build/pkgs/debugpy/checksums.ini | 2 - build/pkgs/decorator/checksums.ini | 2 - build/pkgs/deformation/checksums.ini | 2 - build/pkgs/defusedxml/checksums.ini | 2 - build/pkgs/distlib/checksums.ini | 2 - build/pkgs/docutils/checksums.ini | 2 - build/pkgs/dot2tex/checksums.ini | 2 - build/pkgs/dsdp/checksums.ini | 2 - build/pkgs/e_antic/checksums.ini | 2 - build/pkgs/ecl/checksums.ini | 2 - build/pkgs/eclib/checksums.ini | 2 - build/pkgs/ecm/checksums.ini | 2 - build/pkgs/ecos_python/checksums.ini | 2 - build/pkgs/editables/checksums.ini | 2 - build/pkgs/elliptic_curves/checksums.ini | 2 - build/pkgs/entrypoints/checksums.ini | 2 - build/pkgs/exceptiongroup/checksums.ini | 2 - build/pkgs/executing/checksums.ini | 2 - build/pkgs/fastjsonschema/checksums.ini | 2 - build/pkgs/fflas_ffpack/checksums.ini | 2 - build/pkgs/filelock/checksums.ini | 2 - build/pkgs/flint/checksums.ini | 2 - build/pkgs/flit_core/checksums.ini | 2 - build/pkgs/fonttools/checksums.ini | 2 - build/pkgs/fplll/checksums.ini | 2 - build/pkgs/fpylll/checksums.ini | 2 - build/pkgs/fqdn/checksums.ini | 2 - build/pkgs/freetype/checksums.ini | 2 - build/pkgs/fricas/checksums.ini | 2 - build/pkgs/frobby/checksums.ini | 2 - build/pkgs/furo/checksums.ini | 2 - build/pkgs/gambit/checksums.ini | 2 - build/pkgs/gap/checksums.ini | 2 - build/pkgs/gap3/checksums.ini | 2 - build/pkgs/gap_jupyter/checksums.ini | 2 - build/pkgs/gast/checksums.ini | 2 - build/pkgs/gc/checksums.ini | 2 - build/pkgs/gcc/checksums.ini | 2 - build/pkgs/gdb/checksums.ini | 2 - build/pkgs/gengetopt/checksums.ini | 2 - build/pkgs/gf2x/checksums.ini | 2 - build/pkgs/gfan/checksums.ini | 2 - build/pkgs/giac/checksums.ini | 2 - build/pkgs/givaro/checksums.ini | 2 - build/pkgs/glpk/checksums.ini | 2 - build/pkgs/glucose/checksums.ini | 2 - build/pkgs/gmp/checksums.ini | 2 - build/pkgs/gmpy2/checksums.ini | 2 - build/pkgs/gnumake_tokenpool/checksums.ini | 2 - build/pkgs/gp2c/checksums.ini | 2 - build/pkgs/graphs/checksums.ini | 2 - build/pkgs/gsl/checksums.ini | 2 - build/pkgs/h11/checksums.ini | 2 - .../hatch_fancy_pypi_readme/checksums.ini | 2 - build/pkgs/hatch_vcs/checksums.ini | 2 - build/pkgs/hatchling/checksums.ini | 2 - build/pkgs/httpcore/checksums.ini | 2 - build/pkgs/httpx/checksums.ini | 2 - build/pkgs/idna/checksums.ini | 2 - build/pkgs/igraph/checksums.ini | 2 - build/pkgs/imagesize/checksums.ini | 2 - build/pkgs/iml/checksums.ini | 2 - build/pkgs/importlib_metadata/checksums.ini | 2 - build/pkgs/importlib_resources/checksums.ini | 2 - build/pkgs/info/checksums.ini | 2 - build/pkgs/ipykernel/checksums.ini | 2 - build/pkgs/ipympl/checksums.ini | 2 - build/pkgs/ipython/checksums.ini | 2 - build/pkgs/ipython_genutils/checksums.ini | 2 - build/pkgs/ipywidgets/checksums.ini | 2 - build/pkgs/isl/checksums.ini | 2 - build/pkgs/isoduration/checksums.ini | 2 - build/pkgs/jedi/checksums.ini | 2 - build/pkgs/jinja2/checksums.ini | 2 - build/pkgs/jmol/checksums.ini | 2 - build/pkgs/json5/checksums.ini | 2 - build/pkgs/jsonpointer/checksums.ini | 2 - build/pkgs/jsonschema/checksums.ini | 2 - .../jsonschema_specifications/checksums.ini | 2 - build/pkgs/jupymake/checksums.ini | 2 - build/pkgs/jupyter_client/checksums.ini | 2 - build/pkgs/jupyter_core/checksums.ini | 2 - build/pkgs/jupyter_events/checksums.ini | 2 - build/pkgs/jupyter_jsmol/checksums.ini | 2 - build/pkgs/jupyter_lsp/checksums.ini | 2 - build/pkgs/jupyter_server/checksums.ini | 2 - .../jupyter_server_terminals/checksums.ini | 2 - build/pkgs/jupyterlab/checksums.ini | 2 - build/pkgs/jupyterlab_mathjax2/checksums.ini | 2 - build/pkgs/jupyterlab_pygments/checksums.ini | 2 - build/pkgs/jupyterlab_server/checksums.ini | 2 - build/pkgs/jupyterlab_widgets/checksums.ini | 2 - build/pkgs/kenzo/checksums.ini | 2 - build/pkgs/kissat/checksums.ini | 2 - build/pkgs/kiwisolver/checksums.ini | 2 - build/pkgs/latte_int/checksums.ini | 2 - build/pkgs/lcalc/checksums.ini | 2 - build/pkgs/libatomic_ops/checksums.ini | 2 - build/pkgs/libbraiding/checksums.ini | 2 - build/pkgs/libffi/checksums.ini | 2 - build/pkgs/libgd/checksums.ini | 2 - build/pkgs/libhomfly/checksums.ini | 2 - build/pkgs/libogg/checksums.ini | 2 - build/pkgs/libpng/checksums.ini | 2 - build/pkgs/libsemigroups/checksums.ini | 2 - build/pkgs/libtheora/checksums.ini | 2 - build/pkgs/lidia/checksums.ini | 2 - build/pkgs/lie/checksums.ini | 2 - build/pkgs/linbox/checksums.ini | 2 - build/pkgs/lrcalc/checksums.ini | 2 - build/pkgs/lrcalc_python/checksums.ini | 2 - build/pkgs/lrslib/checksums.ini | 2 - build/pkgs/m4ri/checksums.ini | 2 - build/pkgs/m4rie/checksums.ini | 2 - build/pkgs/markupsafe/checksums.ini | 2 - build/pkgs/mathics/checksums.ini | 2 - build/pkgs/mathics_scanner/checksums.ini | 2 - build/pkgs/mathjax/checksums.ini | 2 - build/pkgs/matplotlib/checksums.ini | 2 - build/pkgs/matplotlib_inline/checksums.ini | 2 - build/pkgs/matroid_database/checksums.ini | 2 - build/pkgs/maxima/checksums.ini | 2 - build/pkgs/mcqd/checksums.ini | 2 - build/pkgs/meataxe/checksums.ini | 2 - build/pkgs/meson/checksums.ini | 2 - build/pkgs/meson_python/checksums.ini | 2 - build/pkgs/mistune/checksums.ini | 2 - .../pkgs/modular_decomposition/checksums.ini | 2 - build/pkgs/modular_resolution/checksums.ini | 2 - build/pkgs/mpc/checksums.ini | 2 - build/pkgs/mpfi/checksums.ini | 2 - build/pkgs/mpfr/checksums.ini | 2 - build/pkgs/mpfrcx/checksums.ini | 2 - build/pkgs/mpmath/checksums.ini | 2 - build/pkgs/nauty/checksums.ini | 2 - build/pkgs/nbclient/checksums.ini | 2 - build/pkgs/nbconvert/checksums.ini | 2 - build/pkgs/nbformat/checksums.ini | 2 - build/pkgs/ncurses/checksums.ini | 2 - build/pkgs/nest_asyncio/checksums.ini | 2 - build/pkgs/networkx/checksums.ini | 2 - build/pkgs/ninja_build/checksums.ini | 2 - build/pkgs/normaliz/checksums.ini | 2 - build/pkgs/notebook/checksums.ini | 2 - build/pkgs/notebook_shim/checksums.ini | 2 - build/pkgs/notedown/checksums.ini | 2 - build/pkgs/ntl/checksums.ini | 2 - build/pkgs/numpy/checksums.ini | 2 - build/pkgs/openblas/checksums.ini | 2 - build/pkgs/openssl/checksums.ini | 2 - build/pkgs/osqp_python/checksums.ini | 2 - build/pkgs/overrides/checksums.ini | 2 - build/pkgs/p_group_cohomology/checksums.ini | 2 - build/pkgs/packaging/checksums.ini | 2 - build/pkgs/palettable/checksums.ini | 2 - build/pkgs/palp/checksums.ini | 2 - build/pkgs/pandoc_attributes/checksums.ini | 2 - build/pkgs/pandocfilters/checksums.ini | 2 - build/pkgs/pari/checksums.ini | 2 - build/pkgs/pari_elldata/checksums.ini | 2 - build/pkgs/pari_galdata/checksums.ini | 2 - build/pkgs/pari_galpol/checksums.ini | 2 - build/pkgs/pari_jupyter/checksums.ini | 2 - build/pkgs/pari_nftables/checksums.ini | 2 - build/pkgs/pari_seadata/checksums.ini | 2 - build/pkgs/pari_seadata_small/checksums.ini | 2 - build/pkgs/parso/checksums.ini | 2 - build/pkgs/patch/checksums.ini | 2 - build/pkgs/patchelf/checksums.ini | 2 - build/pkgs/pathspec/checksums.ini | 2 - .../pkgs/perl_term_readline_gnu/checksums.ini | 2 - build/pkgs/pexpect/checksums.ini | 2 - build/pkgs/pickleshare/checksums.ini | 2 - build/pkgs/pillow/checksums.ini | 2 - build/pkgs/pint/checksums.ini | 2 - build/pkgs/pip/checksums.ini | 2 - build/pkgs/pkgconf/checksums.ini | 2 - build/pkgs/pkgconfig/checksums.ini | 2 - build/pkgs/planarity/checksums.ini | 2 - build/pkgs/plantri/checksums.ini | 2 - build/pkgs/platformdirs/checksums.ini | 2 - build/pkgs/pluggy/checksums.ini | 2 - build/pkgs/ply/checksums.ini | 2 - build/pkgs/polylib/checksums.ini | 2 - build/pkgs/polymake/checksums.ini | 2 - build/pkgs/polytopes_db/checksums.ini | 2 - build/pkgs/polytopes_db_4d/checksums.ini | 2 - build/pkgs/ppl/checksums.ini | 2 - build/pkgs/pplpy/checksums.ini | 2 - build/pkgs/primecount/checksums.ini | 2 - build/pkgs/primecountpy/checksums.ini | 2 - build/pkgs/primesieve/checksums.ini | 2 - build/pkgs/prometheus_client/checksums.ini | 2 - build/pkgs/prompt_toolkit/checksums.ini | 2 - build/pkgs/psutil/checksums.ini | 2 - build/pkgs/ptyprocess/checksums.ini | 2 - build/pkgs/pure_eval/checksums.ini | 2 - build/pkgs/py/checksums.ini | 2 - build/pkgs/pybind11/checksums.ini | 2 - build/pkgs/pycosat/checksums.ini | 2 - build/pkgs/pycparser/checksums.ini | 2 - build/pkgs/pygments/checksums.ini | 2 - build/pkgs/pynormaliz/checksums.ini | 2 - build/pkgs/pyparsing/checksums.ini | 2 - build/pkgs/pyproject_api/checksums.ini | 2 - build/pkgs/pyproject_metadata/checksums.ini | 2 - build/pkgs/pyrsistent/checksums.ini | 2 - build/pkgs/pysingular/checksums.ini | 2 - build/pkgs/python3/checksums.ini | 2 - build/pkgs/python_igraph/checksums.ini | 2 - build/pkgs/python_json_logger/checksums.ini | 2 - build/pkgs/pytz/checksums.ini | 2 - .../pkgs/pytz_deprecation_shim/checksums.ini | 2 - build/pkgs/pyyaml/checksums.ini | 2 - build/pkgs/pyzmq/checksums.ini | 2 - build/pkgs/qdldl_python/checksums.ini | 2 - build/pkgs/qepcad/checksums.ini | 2 - build/pkgs/qhull/checksums.ini | 2 - build/pkgs/readline/checksums.ini | 2 - build/pkgs/referencing/checksums.ini | 2 - build/pkgs/requests/checksums.ini | 2 - build/pkgs/rfc3339_validator/checksums.ini | 2 - build/pkgs/rfc3986_validator/checksums.ini | 2 - build/pkgs/rpy2/checksums.ini | 2 - build/pkgs/rst2ipynb/checksums.ini | 2 - build/pkgs/rubiks/checksums.ini | 2 - build/pkgs/rw/checksums.ini | 2 - build/pkgs/saclib/checksums.ini | 2 - .../checksums.ini | 2 - .../checksums.ini | 2 - .../checksums.ini | 2 - build/pkgs/sagenb_export/checksums.ini | 2 - build/pkgs/sagetex/checksums.ini | 2 - build/pkgs/scs/checksums.ini | 2 - build/pkgs/send2trash/checksums.ini | 2 - build/pkgs/setuptools/checksums.ini | 2 - build/pkgs/setuptools_scm/checksums.ini | 2 - build/pkgs/singular/checksums.ini | 2 - build/pkgs/singular_jupyter/checksums.ini | 2 - build/pkgs/sirocco/checksums.ini | 2 - build/pkgs/six/checksums.ini | 2 - build/pkgs/sniffio/checksums.ini | 2 - build/pkgs/snowballstemmer/checksums.ini | 2 - build/pkgs/soupsieve/checksums.ini | 2 - build/pkgs/sphinx/checksums.ini | 2 - build/pkgs/sphinx_basic_ng/checksums.ini | 2 - build/pkgs/sphinx_copybutton/checksums.ini | 2 - build/pkgs/sphinx_inline_tabs/checksums.ini | 2 - .../sphinxcontrib_applehelp/checksums.ini | 2 - .../pkgs/sphinxcontrib_devhelp/checksums.ini | 2 - .../pkgs/sphinxcontrib_htmlhelp/checksums.ini | 2 - build/pkgs/sphinxcontrib_jsmath/checksums.ini | 2 - build/pkgs/sphinxcontrib_qthelp/checksums.ini | 2 - .../checksums.ini | 2 - .../sphinxcontrib_websupport/checksums.ini | 2 - build/pkgs/sqlite/checksums.ini | 2 - build/pkgs/stack_data/checksums.ini | 2 - build/pkgs/suitesparse/checksums.ini | 2 - build/pkgs/surf/checksums.ini | 2 - build/pkgs/symengine/checksums.ini | 2 - build/pkgs/symengine_py/checksums.ini | 5 +- build/pkgs/symmetrica/checksums.ini | 2 - build/pkgs/sympow/checksums.ini | 2 - build/pkgs/sympy/checksums.ini | 2 - build/pkgs/tachyon/checksums.ini | 2 - build/pkgs/tdlib/checksums.ini | 2 - build/pkgs/terminado/checksums.ini | 2 - build/pkgs/texttable/checksums.ini | 2 - build/pkgs/threejs/checksums.ini | 2 - build/pkgs/tides/checksums.ini | 2 - build/pkgs/tinycss2/checksums.ini | 2 - build/pkgs/tomli/checksums.ini | 2 - build/pkgs/topcom/checksums.ini | 2 - build/pkgs/tornado/checksums.ini | 2 - build/pkgs/tox/checksums.ini | 2 - build/pkgs/traitlets/checksums.ini | 2 - build/pkgs/trove_classifiers/checksums.ini | 2 - .../pkgs/types_python_dateutil/checksums.ini | 2 - build/pkgs/typing_extensions/checksums.ini | 2 - build/pkgs/tzdata/checksums.ini | 2 - build/pkgs/tzlocal/checksums.ini | 2 - build/pkgs/uri_template/checksums.ini | 2 - build/pkgs/urllib3/checksums.ini | 2 - build/pkgs/valgrind/checksums.ini | 2 - build/pkgs/virtualenv/checksums.ini | 2 - build/pkgs/wcwidth/checksums.ini | 2 - build/pkgs/webcolors/checksums.ini | 2 - build/pkgs/webencodings/checksums.ini | 2 - build/pkgs/websocket_client/checksums.ini | 2 - build/pkgs/wheel/checksums.ini | 2 - build/pkgs/widgetsnbextension/checksums.ini | 2 - build/pkgs/xz/checksums.ini | 2 - build/pkgs/zeromq/checksums.ini | 2 - build/pkgs/zipp/checksums.ini | 2 - build/pkgs/zlib/checksums.ini | 2 - build/sage_bootstrap/cksum.py | 96 ------------------- build/sage_bootstrap/package.py | 30 +----- build/sage_bootstrap/tarball.py | 10 +- build/sage_bootstrap/updater.py | 4 +- build/test/test_cksum.py | 28 ------ 364 files changed, 5 insertions(+), 884 deletions(-) delete mode 100644 build/sage_bootstrap/cksum.py delete mode 100644 build/test/test_cksum.py diff --git a/build/pkgs/4ti2/checksums.ini b/build/pkgs/4ti2/checksums.ini index 5e3be152e91..a53ea5b8f04 100644 --- a/build/pkgs/4ti2/checksums.ini +++ b/build/pkgs/4ti2/checksums.ini @@ -1,6 +1,4 @@ tarball=4ti2-${VERSION}.tar.gz sha1=3d41f30ea3ef94c293eae30c087494269fc1a6b9 sha256=f7c191beb14246b643e4fd5b18b53d9966693b9e6d3a569441a0e3ca14b1a86b -md5=1215872325ddfc561865ecb22b2bccb2 -cksum=2439180289 upstream_url=https://github.com/4ti2/4ti2/releases/download/Release_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}/4ti2-${VERSION}.tar.gz diff --git a/build/pkgs/alabaster/checksums.ini b/build/pkgs/alabaster/checksums.ini index e1dd770acf5..a58c93e8f4a 100644 --- a/build/pkgs/alabaster/checksums.ini +++ b/build/pkgs/alabaster/checksums.ini @@ -1,6 +1,4 @@ tarball=alabaster-VERSION-py3-none-any.whl sha1=6c86446396c69236a1542e09771e8d7b8487dcfa sha256=b46733c07dce03ae4e150330b975c75737fa60f0a7c591b6c8bf4928a28e2c92 -md5=a1c5ddb246633ac0567beef4a1dcffd7 -cksum=2188566230 upstream_url=https://pypi.io/packages/py3/a/alabaster/alabaster-VERSION-py3-none-any.whl diff --git a/build/pkgs/anyio/checksums.ini b/build/pkgs/anyio/checksums.ini index 95704a75b81..edc3a769889 100644 --- a/build/pkgs/anyio/checksums.ini +++ b/build/pkgs/anyio/checksums.ini @@ -1,6 +1,4 @@ tarball=anyio-VERSION-py3-none-any.whl sha1=bb08368bb19e1aff2f4190e39300e43fee52103e sha256=cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f -md5=420d85e19168705cdf0223621b18831a -cksum=627181302 upstream_url=https://pypi.io/packages/py3/a/anyio/anyio-VERSION-py3-none-any.whl diff --git a/build/pkgs/appdirs/checksums.ini b/build/pkgs/appdirs/checksums.ini index 4199d3d7291..0d44544631d 100644 --- a/build/pkgs/appdirs/checksums.ini +++ b/build/pkgs/appdirs/checksums.ini @@ -1,6 +1,4 @@ tarball=appdirs-VERSION-py2.py3-none-any.whl sha1=fc74022712122436427f8282a47bfa430ec2db56 sha256=a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 -md5=1d638a5913a8d8ed8e7c7d789ece149c -cksum=3594208532 upstream_url=https://pypi.io/packages/py2.py3/a/appdirs/appdirs-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/appnope/checksums.ini b/build/pkgs/appnope/checksums.ini index 1a62a3a7a31..e9ee40864d3 100644 --- a/build/pkgs/appnope/checksums.ini +++ b/build/pkgs/appnope/checksums.ini @@ -1,6 +1,4 @@ tarball=appnope-VERSION.tar.gz sha1=dd705054af5f6c80d0ce9e1b444428c7b1b07daa sha256=02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24 -md5=ca8ec0b1628061ce922dbf1ceee25bca -cksum=3863274580 upstream_url=https://pypi.io/packages/source/a/appnope/appnope-VERSION.tar.gz diff --git a/build/pkgs/argon2_cffi/checksums.ini b/build/pkgs/argon2_cffi/checksums.ini index 60f1ce9fa07..acfeee93d3a 100644 --- a/build/pkgs/argon2_cffi/checksums.ini +++ b/build/pkgs/argon2_cffi/checksums.ini @@ -1,6 +1,4 @@ tarball=argon2-cffi-VERSION.tar.gz sha1=c16c1506de0211bdfa23d4d51e780fb4aaff5222 sha256=d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b -md5=b7843e8690c790f8e743d37bb75c25a8 -cksum=3700408796 upstream_url=https://pypi.io/packages/source/a/argon2_cffi/argon2-cffi-VERSION.tar.gz diff --git a/build/pkgs/argon2_cffi_bindings/checksums.ini b/build/pkgs/argon2_cffi_bindings/checksums.ini index 9cdfb9a28f8..b0e7ade0b5a 100644 --- a/build/pkgs/argon2_cffi_bindings/checksums.ini +++ b/build/pkgs/argon2_cffi_bindings/checksums.ini @@ -1,6 +1,4 @@ tarball=argon2-cffi-bindings-VERSION.tar.gz sha1=5a9b8906d9ca73c53c2bf0a2f0a8127fda69e965 sha256=bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3 -md5=f1591e1af7dea9ef3e5b982e2c196c1d -cksum=2420586823 upstream_url=https://pypi.io/packages/source/a/argon2_cffi_bindings/argon2-cffi-bindings-VERSION.tar.gz diff --git a/build/pkgs/arrow/checksums.ini b/build/pkgs/arrow/checksums.ini index 75fb726029a..5ac9740854e 100644 --- a/build/pkgs/arrow/checksums.ini +++ b/build/pkgs/arrow/checksums.ini @@ -1,6 +1,4 @@ tarball=arrow-VERSION-py3-none-any.whl sha1=fd9376ef4788dc2b1c981e6b5beb9048e046c556 sha256=c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80 -md5=71d18bb3d882ae242b5b1a397313bb12 -cksum=244356435 upstream_url=https://pypi.io/packages/py3/a/arrow/arrow-VERSION-py3-none-any.whl diff --git a/build/pkgs/asttokens/checksums.ini b/build/pkgs/asttokens/checksums.ini index 74dee3a1017..9c5d57c3a17 100644 --- a/build/pkgs/asttokens/checksums.ini +++ b/build/pkgs/asttokens/checksums.ini @@ -1,6 +1,4 @@ tarball=asttokens-VERSION.tar.gz sha1=d522a139240293953c99d32ca62c41542babb963 sha256=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0 -md5=c353679585a40f43c24ca60fca33bbf6 -cksum=1117135252 upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz diff --git a/build/pkgs/async_lru/checksums.ini b/build/pkgs/async_lru/checksums.ini index b70f2c6bce2..f1b60406ec1 100644 --- a/build/pkgs/async_lru/checksums.ini +++ b/build/pkgs/async_lru/checksums.ini @@ -1,6 +1,4 @@ tarball=async_lru-VERSION-py3-none-any.whl sha1=99b2ea5d551cbad28e08e45f0d0b00827f9ff73d sha256=ff02944ce3c288c5be660c42dbcca0742b32c3b279d6dceda655190240b99224 -md5=de1e9e7559810690de8b7084b372d9a2 -cksum=3326301475 upstream_url=https://pypi.io/packages/py3/a/async_lru/async_lru-VERSION-py3-none-any.whl diff --git a/build/pkgs/attrs/checksums.ini b/build/pkgs/attrs/checksums.ini index dcfa1c31428..01a3de82ed3 100644 --- a/build/pkgs/attrs/checksums.ini +++ b/build/pkgs/attrs/checksums.ini @@ -1,6 +1,4 @@ tarball=attrs-VERSION-py3-none-any.whl sha1=d916b1ecad441ce7f07d86034085475f6c231830 sha256=1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 -md5=5aecf1f8857233a04c1926ea68e8f860 -cksum=1934687514 upstream_url=https://pypi.io/packages/py3/a/attrs/attrs-VERSION-py3-none-any.whl diff --git a/build/pkgs/awali/checksums.ini b/build/pkgs/awali/checksums.ini index d9678c3b4a8..ccc3c7e3862 100644 --- a/build/pkgs/awali/checksums.ini +++ b/build/pkgs/awali/checksums.ini @@ -1,5 +1,3 @@ tarball=awali-all-vVERSION.tgz sha1=9098aaefde031df58374bab0c1fc38109eecd4e3 sha256=85a2de222f93554d2959e16f64d8e7549b25446dcb0564ed1cb57196fc35f108 -md5=d4216d8cbe21f83ae3a816a2f994f85e -cksum=3149228485 diff --git a/build/pkgs/babel/checksums.ini b/build/pkgs/babel/checksums.ini index 1ddb70619dd..84e9171f829 100644 --- a/build/pkgs/babel/checksums.ini +++ b/build/pkgs/babel/checksums.ini @@ -1,6 +1,4 @@ tarball=Babel-VERSION-py3-none-any.whl sha1=7f8671a725d0bbf28618841c441af8bd7709d527 sha256=efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287 -md5=36702a42728c34366bf2ba612b9077cc -cksum=2476971038 upstream_url=https://pypi.io/packages/py3/b/babel/Babel-VERSION-py3-none-any.whl diff --git a/build/pkgs/barvinok/checksums.ini b/build/pkgs/barvinok/checksums.ini index 38e0255e609..84ffc3e212b 100644 --- a/build/pkgs/barvinok/checksums.ini +++ b/build/pkgs/barvinok/checksums.ini @@ -1,6 +1,4 @@ tarball=barvinok-VERSION.tar.xz sha1=1e17e72732f7e96017d9ae0c3394c3c77c185f2e sha256=049a2e0ac061668c2cb6d9832e42c3800c09b5095aef57abd8421ea727df58a3 -md5=57066c5aa5628b89345c16ed95f93d7e -cksum=2863920036 upstream_url=https://sourceforge.net/projects/barvinok/files/barvinok-VERSION.tar.xz diff --git a/build/pkgs/beautifulsoup4/checksums.ini b/build/pkgs/beautifulsoup4/checksums.ini index 431a522c408..01abdd62940 100644 --- a/build/pkgs/beautifulsoup4/checksums.ini +++ b/build/pkgs/beautifulsoup4/checksums.ini @@ -1,6 +1,4 @@ tarball=beautifulsoup4-VERSION.tar.gz sha1=d9cd72f81e7710692b8ff0a42e69bf93375b5fd3 sha256=492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da -md5=b49a6696a762e946c2be97c36a5adaa8 -cksum=839566236 upstream_url=https://pypi.io/packages/source/b/beautifulsoup4/beautifulsoup4-VERSION.tar.gz diff --git a/build/pkgs/beniget/checksums.ini b/build/pkgs/beniget/checksums.ini index ecb028be62c..b7b3d25085b 100644 --- a/build/pkgs/beniget/checksums.ini +++ b/build/pkgs/beniget/checksums.ini @@ -1,6 +1,4 @@ tarball=beniget-VERSION.tar.gz sha1=0167f16d17fbd61b91e620bca07e4ec7054ce51d sha256=75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c -md5=a2bbe7f17f10f9c127d8ef00692ddc55 -cksum=2287567629 upstream_url=https://pypi.io/packages/source/b/beniget/beniget-VERSION.tar.gz diff --git a/build/pkgs/benzene/checksums.ini b/build/pkgs/benzene/checksums.ini index a4b4666715d..6982671a3c8 100644 --- a/build/pkgs/benzene/checksums.ini +++ b/build/pkgs/benzene/checksums.ini @@ -1,5 +1,3 @@ tarball=benzene-VERSION.tar.bz2 sha1=7618f1e21e91459a8b050b948698a75b042d6d80 sha256=63e8662672a007f5b2a727df0ab0e38825c65229fd1060fbf5b5d87b3301e9c6 -md5=ac592d6af7495b51b382b8828ee84323 -cksum=1973449623 diff --git a/build/pkgs/bleach/checksums.ini b/build/pkgs/bleach/checksums.ini index c5284c308f3..575b1452888 100644 --- a/build/pkgs/bleach/checksums.ini +++ b/build/pkgs/bleach/checksums.ini @@ -1,6 +1,4 @@ tarball=bleach-VERSION-py3-none-any.whl sha1=7ba81a446171fb840d3083afadd0c87f0b599305 sha256=3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6 -md5=ec9e860103ffbc3e6e9963485464bfbc -cksum=1174632300 upstream_url=https://pypi.io/packages/py3/b/bleach/bleach-VERSION-py3-none-any.whl diff --git a/build/pkgs/bliss/checksums.ini b/build/pkgs/bliss/checksums.ini index 43a28b1e2b9..88e6065ba17 100644 --- a/build/pkgs/bliss/checksums.ini +++ b/build/pkgs/bliss/checksums.ini @@ -1,6 +1,4 @@ tarball=bliss-VERSION.zip sha1=c91c9dcbc11d66ffbcf6415e09ebe793df37be2a sha256=acc8b98034f30fad24c897f365abd866c13d9f1bb207e398d0caf136875972a4 -md5=5707cbfd9fd00980571c64ab3584c505 -cksum=1626493724 upstream_url=https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-VERSION.zip diff --git a/build/pkgs/boost_cropped/checksums.ini b/build/pkgs/boost_cropped/checksums.ini index de64a05a26c..3ebb8041d98 100644 --- a/build/pkgs/boost_cropped/checksums.ini +++ b/build/pkgs/boost_cropped/checksums.ini @@ -1,5 +1,3 @@ tarball=boost_cropped-VERSION.tar.bz2 sha1=a00ffbbcaeefa2efd80fc6fc6ef1a295c165acd9 sha256=f008c70cb82a30fd63f42f6a850fdfe344731b95e35e8a38d5a886cdf8efc921 -md5=43b1d77344682e229ca8c702e42572b8 -cksum=2257236793 diff --git a/build/pkgs/brial/checksums.ini b/build/pkgs/brial/checksums.ini index 48ce40b2759..80efcb38591 100644 --- a/build/pkgs/brial/checksums.ini +++ b/build/pkgs/brial/checksums.ini @@ -1,6 +1,4 @@ tarball=brial-VERSION.tar.bz2 sha1=ea69faff56fb7068536723f3fb5b3583b8467831 sha256=deb95fc1a99b6f9324f1278fcb676a605b77d59f24683d6af87f573cb46d0a4f -md5=d6c6a01d4fc80062550e02d9185bfbff -cksum=318826732 upstream_url=https://github.com/BRiAl/BRiAl/releases/download/VERSION/brial-VERSION.tar.bz2 diff --git a/build/pkgs/buckygen/checksums.ini b/build/pkgs/buckygen/checksums.ini index 1c9af77579f..3e2e6843ce0 100644 --- a/build/pkgs/buckygen/checksums.ini +++ b/build/pkgs/buckygen/checksums.ini @@ -1,5 +1,3 @@ tarball=buckygen-VERSION.zip sha1=a106afecbd55ece18cd75b2e3be6720f5c599d79 sha256=c151b33078913bed7f72977821d246c6dda5e01b64a53d963b5f95b65852e634 -md5=ce46e081eaa23c1cb1004eafe24de831 -cksum=1392809973 diff --git a/build/pkgs/bzip2/checksums.ini b/build/pkgs/bzip2/checksums.ini index 7172a563e3e..206d87ff1e3 100644 --- a/build/pkgs/bzip2/checksums.ini +++ b/build/pkgs/bzip2/checksums.ini @@ -1,5 +1,3 @@ tarball=bzip2-VERSION.tar.gz sha1=ddccd26b2f94700ade5906b0648095b0ddac525c sha256=296b7d4f9bccd58ebbb14d3317e9e97fdd0d7ff13e42cd32285faa626c75455f -md5=80c416073bee97c9ae56f5c5efd29065 -cksum=383440329 diff --git a/build/pkgs/cachetools/checksums.ini b/build/pkgs/cachetools/checksums.ini index 8b7724701ad..9c2aa8528b0 100644 --- a/build/pkgs/cachetools/checksums.ini +++ b/build/pkgs/cachetools/checksums.ini @@ -1,6 +1,4 @@ tarball=cachetools-VERSION-py3-none-any.whl sha1=f7deaa4b10ae6d8955c83b0573e5b80f84e5d87a sha256=95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 -md5=7375eb8031ea2c95b91d2406c29e9379 -cksum=3631496040 upstream_url=https://pypi.io/packages/py3/c/cachetools/cachetools-VERSION-py3-none-any.whl diff --git a/build/pkgs/calver/checksums.ini b/build/pkgs/calver/checksums.ini index 88e83d9309f..8c23449b03d 100644 --- a/build/pkgs/calver/checksums.ini +++ b/build/pkgs/calver/checksums.ini @@ -1,6 +1,4 @@ tarball=calver-VERSION-py3-none-any.whl sha1=4553e3fbfc58908f3be2dd529e5991986f6a46b5 sha256=a1d7fcdd67797afc52ee36ffb8c8adf6643173864306547bfd1380cbce6310a0 -md5=3c34037d7bd217efd99b738aa1a7744b -cksum=3667684754 upstream_url=https://pypi.io/packages/py3/c/calver/calver-VERSION-py3-none-any.whl diff --git a/build/pkgs/cbc/checksums.ini b/build/pkgs/cbc/checksums.ini index 3c8f48783e3..3f49dd0da0b 100644 --- a/build/pkgs/cbc/checksums.ini +++ b/build/pkgs/cbc/checksums.ini @@ -1,6 +1,4 @@ tarball=cbc-VERSION.tar.gz sha1=d937d6af1ee8838d44659ebd4cf7bbb1b20372ce sha256=e39acffdac115e6b9c0d6f1afaf4f890f037007061d7ad4e0a47b95ec18db752 -md5=2134576233cc95cdfedc63991a4944ec -cksum=1215468781 upstream_url=https://github.com/coin-or/Cbc/archive/refs/tags/releases/VERSION.tar.gz diff --git a/build/pkgs/ccache/checksums.ini b/build/pkgs/ccache/checksums.ini index aa8dafbe525..2b4b1895243 100644 --- a/build/pkgs/ccache/checksums.ini +++ b/build/pkgs/ccache/checksums.ini @@ -1,5 +1,3 @@ tarball=ccache-VERSION.tar.bz2 sha1=3653e0765f01697c449f7026c479fbd9526323a7 sha256=fa9d7f38367431bc86b19ad107d709ca7ecf1574fdacca01698bdf0a47cd8567 -md5=1f6ab79c60660f90c88f47708803605e -cksum=1428047259 diff --git a/build/pkgs/cddlib/checksums.ini b/build/pkgs/cddlib/checksums.ini index c9e83468a11..974373cf670 100644 --- a/build/pkgs/cddlib/checksums.ini +++ b/build/pkgs/cddlib/checksums.ini @@ -1,6 +1,4 @@ tarball=cddlib-VERSION.tar.gz sha1=8f38597a0479a191a62346dab89794e888c478b6 sha256=70dffdb3369b8704dc75428a1b3c42ab9047b81ce039f12f427e2eb2b1b0dee2 -md5=ec7f35912e34232b5306a643f99b6311 -cksum=2420656558 upstream_url=https://github.com/cddlib/cddlib/releases/download/VERSION/cddlib-VERSION.tar.gz diff --git a/build/pkgs/certifi/checksums.ini b/build/pkgs/certifi/checksums.ini index 227cc29270b..1a07649c990 100644 --- a/build/pkgs/certifi/checksums.ini +++ b/build/pkgs/certifi/checksums.ini @@ -1,6 +1,4 @@ tarball=certifi-VERSION-py3-none-any.whl sha1=9e99fff8d517d9c5b8d8fe6fe66bc31fa55b0fec sha256=e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474 -md5=c97d3905f6f805c9ccf70af93c7f0ace -cksum=3858731419 upstream_url=https://pypi.io/packages/py3/c/certifi/certifi-VERSION-py3-none-any.whl diff --git a/build/pkgs/cffi/checksums.ini b/build/pkgs/cffi/checksums.ini index 4736b251320..6b22c299649 100644 --- a/build/pkgs/cffi/checksums.ini +++ b/build/pkgs/cffi/checksums.ini @@ -1,6 +1,4 @@ tarball=cffi-VERSION.tar.gz sha1=c42a46cd11f6153f299cf10e9c236e8b2a143c21 sha256=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 -md5=f493860a6e98cd0c4178149568a6b4f6 -cksum=585894851 upstream_url=https://pypi.io/packages/source/c/cffi/cffi-VERSION.tar.gz diff --git a/build/pkgs/chardet/checksums.ini b/build/pkgs/chardet/checksums.ini index a02c86d03ec..8bce7750395 100644 --- a/build/pkgs/chardet/checksums.ini +++ b/build/pkgs/chardet/checksums.ini @@ -1,6 +1,4 @@ tarball=chardet-VERSION-py3-none-any.whl sha1=2facc0387556aa8a2956ef682d49fc3eae56d30a sha256=e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970 -md5=b9eda7cd7d1582e269bd8eb7ffc4fcad -cksum=1563594607 upstream_url=https://pypi.io/packages/py3/c/chardet/chardet-VERSION-py3-none-any.whl diff --git a/build/pkgs/charset_normalizer/checksums.ini b/build/pkgs/charset_normalizer/checksums.ini index 6e9c72bf058..0530b566631 100644 --- a/build/pkgs/charset_normalizer/checksums.ini +++ b/build/pkgs/charset_normalizer/checksums.ini @@ -1,6 +1,4 @@ tarball=charset_normalizer-VERSION-py3-none-any.whl sha1=1aa12424059bec1d95d9dda38b4ff6d062dededf sha256=3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc -md5=ea733f7299c80a232262a7f71a4fc698 -cksum=984483622 upstream_url=https://pypi.io/packages/py3/c/charset_normalizer/charset_normalizer-VERSION-py3-none-any.whl diff --git a/build/pkgs/cliquer/checksums.ini b/build/pkgs/cliquer/checksums.ini index 15b4091c1ed..ae0300270b2 100644 --- a/build/pkgs/cliquer/checksums.ini +++ b/build/pkgs/cliquer/checksums.ini @@ -1,6 +1,4 @@ tarball=cliquer-VERSION.tar.gz sha1=2973abfcf84f9d098e8abbf4f0ac4b776c7f6105 sha256=6ff79e1e9983ebabbca3dd276a8a310cbdeb48c7adf95f37abd83129b566340e -md5=f37da2689c4f867407a9030a5cfc39e6 -cksum=1511776397 upstream_url=https://github.com/dimpase/autocliquer/releases/download/vVERSION/cliquer-VERSION.tar.gz diff --git a/build/pkgs/cmake/checksums.ini b/build/pkgs/cmake/checksums.ini index b002b8e79ec..477a967711a 100644 --- a/build/pkgs/cmake/checksums.ini +++ b/build/pkgs/cmake/checksums.ini @@ -1,6 +1,4 @@ tarball=cmake-VERSION.tar.gz sha1=05de9ac807fefeb2a36ed5e8fcea376a00dd3d57 sha256=fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc -md5=df0e65607c9280a8df68b2c93eac4437 -cksum=3851971657 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz diff --git a/build/pkgs/cocoalib/checksums.ini b/build/pkgs/cocoalib/checksums.ini index 9759c40e769..bc38adaecfe 100644 --- a/build/pkgs/cocoalib/checksums.ini +++ b/build/pkgs/cocoalib/checksums.ini @@ -1,5 +1,3 @@ tarball=CoCoALib-VERSION.tgz sha1=087b7fa3d905c47a6ff70e4e4cc2fbc031227631 sha256=c7d3d69b44eefd316a456720aee4cf1fdf74ad9940f527646533fe1540add4ba -md5=1cfc3b6ff549ea01e1bffaf3bc9600a8 -cksum=2933468620 diff --git a/build/pkgs/colorama/checksums.ini b/build/pkgs/colorama/checksums.ini index a0c4ec669ab..3332565f156 100644 --- a/build/pkgs/colorama/checksums.ini +++ b/build/pkgs/colorama/checksums.ini @@ -1,6 +1,4 @@ tarball=colorama-VERSION-py2.py3-none-any.whl sha1=d6ab1608850fecfc0e1cf50bf93d743695c04027 sha256=4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 -md5=3fc7a89530d68d7ea231ebe779c0db9c -cksum=3297334831 upstream_url=https://pypi.io/packages/py2.py3/c/colorama/colorama-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/combinatorial_designs/checksums.ini b/build/pkgs/combinatorial_designs/checksums.ini index 1f845f5b6ec..7fc2ef9b3a8 100644 --- a/build/pkgs/combinatorial_designs/checksums.ini +++ b/build/pkgs/combinatorial_designs/checksums.ini @@ -1,5 +1,3 @@ tarball=combinatorial_designs-VERSION.tar.bz2 sha1=353ba24217f9b7920890a784fd75dc59175f7196 sha256=c9486c6d7ec71da338589a6e301723be4e55e02dcfc41f8dba11a682e3b3482e -md5=f345a6918b1bcf34fcd71c2f26d10de0 -cksum=131472289 diff --git a/build/pkgs/comm/checksums.ini b/build/pkgs/comm/checksums.ini index 3c89c2242e4..34f21ec0087 100644 --- a/build/pkgs/comm/checksums.ini +++ b/build/pkgs/comm/checksums.ini @@ -1,6 +1,4 @@ tarball=comm-VERSION-py3-none-any.whl sha1=e7e20f9c1524a9fe059c0b6df90a68e1cd2115a9 sha256=6d52794cba11b36ed9860999cd10fd02d6b2eac177068fdd585e1e2f8a96e67a -md5=165e29c257c70498b61c7a31916727f2 -cksum=2011044045 upstream_url=https://pypi.io/packages/py3/c/comm/comm-VERSION-py3-none-any.whl diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini index 09ed5b06d26..2823ef85c08 100644 --- a/build/pkgs/contourpy/checksums.ini +++ b/build/pkgs/contourpy/checksums.ini @@ -1,6 +1,4 @@ tarball=contourpy-VERSION.tar.gz sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a sha256=96ba37c2e24b7212a77da85004c38e7c4d155d3e72a45eeaf22c1f03f607e8ab -md5=dd89f11007f39baec1e858ad1f464ea9 -cksum=239770832 upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz diff --git a/build/pkgs/conway_polynomials/checksums.ini b/build/pkgs/conway_polynomials/checksums.ini index 188535c1258..ad748205e1a 100644 --- a/build/pkgs/conway_polynomials/checksums.ini +++ b/build/pkgs/conway_polynomials/checksums.ini @@ -1,6 +1,4 @@ tarball=conway-polynomials-VERSION.tar.gz sha1=cf0904c184d7f947eaae0de1b0e2e47411e9cfda sha256=67ddcd7c0fa7a569fddd9ba70621423e638fd03646c1d4a375c8301f6b1100cb -md5=ddc0e82da67120efc353a6ec29c4cca2 -cksum=2976854063 upstream_url=https://files.pythonhosted.org/packages/source/c/conway-polynomials/conway-polynomials-VERSION.tar.gz diff --git a/build/pkgs/coxeter3/checksums.ini b/build/pkgs/coxeter3/checksums.ini index 718e333a9bb..ae16064a597 100644 --- a/build/pkgs/coxeter3/checksums.ini +++ b/build/pkgs/coxeter3/checksums.ini @@ -1,5 +1,3 @@ tarball=coxeter-VERSION.tar.bz2 sha1=2f9ba814043c39ab4063ed31f384d908072cae4e sha256=659e13317716148a70fee53c8555e494931b7820f41a1627f735c4c753ac1268 -md5=46318ee161fd18b8a0c438b8a4f6c411 -cksum=440369702 diff --git a/build/pkgs/cppy/checksums.ini b/build/pkgs/cppy/checksums.ini index d68cbb535a5..8c1171ff28d 100644 --- a/build/pkgs/cppy/checksums.ini +++ b/build/pkgs/cppy/checksums.ini @@ -1,6 +1,4 @@ tarball=cppy-VERSION.tar.gz sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f sha256=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b -md5=7c1f825c43dd66454440932a35b9969c -cksum=1879136901 upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz diff --git a/build/pkgs/cryptominisat/checksums.ini b/build/pkgs/cryptominisat/checksums.ini index 2756aab1ae5..f3838f6618c 100644 --- a/build/pkgs/cryptominisat/checksums.ini +++ b/build/pkgs/cryptominisat/checksums.ini @@ -1,6 +1,4 @@ tarball=cryptominisat-VERSION.tar.gz sha1=f79dfa1ffc6c9c75b3a33f76d3a89a3df2b3f4c2 sha256=50153025c8503ef32f32fff847ee24871bb0fc1f0b13e17fe01aa762923f6d94 -md5=05bdde77aa78c983849437e93b39bd6a -cksum=462131608 upstream_url=https://github.com/msoos/cryptominisat/archive/refs/tags/VERSION.tar.gz diff --git a/build/pkgs/csdp/checksums.ini b/build/pkgs/csdp/checksums.ini index aa4da0208e0..8367332b77a 100644 --- a/build/pkgs/csdp/checksums.ini +++ b/build/pkgs/csdp/checksums.ini @@ -1,5 +1,3 @@ tarball=csdp-VERSION.tar.gz sha1=017cbf067f190a2491692be6796f9b6af29c903e sha256=4bc8d09eec34557c4f483b8fda6bb1ff9d00c659c91ca71fc8b4a77a14346be0 -md5=520497cf33c3049a22b03681a5d717d8 -cksum=127128634 diff --git a/build/pkgs/cunningham_tables/checksums.ini b/build/pkgs/cunningham_tables/checksums.ini index 1e609fa7e78..47cb1afb35b 100644 --- a/build/pkgs/cunningham_tables/checksums.ini +++ b/build/pkgs/cunningham_tables/checksums.ini @@ -1,6 +1,4 @@ tarball=cunningham_tables-VERSION.tar.gz sha1=8bea1a113d85bb9c37d8f213dd19525d9d026f22 sha256=ef39ab25bef5b1813071c9bd96abe3a9e683d5595c9654a3ffde5b07b7fe52b0 -md5=e71b32f12e9a46c1c86e275e8441a06b -cksum=1990403877 upstream_url=http://users.ox.ac.uk/~coml0531/sage/cunningham_tables-VERSION.tar.gz diff --git a/build/pkgs/curl/checksums.ini b/build/pkgs/curl/checksums.ini index ed4b615d303..6edbac68445 100644 --- a/build/pkgs/curl/checksums.ini +++ b/build/pkgs/curl/checksums.ini @@ -1,6 +1,4 @@ tarball=curl-VERSION.tar.bz2 sha1=0113fe762aed27d58c4e53ce2be7a98bc7f74957 sha256=702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d -md5=35fca80437f32dd7ef6c2e30b4916f06 -cksum=1239842454 upstream_url=https://curl.se/download/curl-VERSION.tar.bz2 diff --git a/build/pkgs/cvxopt/checksums.ini b/build/pkgs/cvxopt/checksums.ini index 9f6e549bae8..ca2f4711f5d 100644 --- a/build/pkgs/cvxopt/checksums.ini +++ b/build/pkgs/cvxopt/checksums.ini @@ -1,6 +1,4 @@ tarball=cvxopt-VERSION.tar.gz sha1=f9c3c3fb61e87d27f05b3b66bc10734d5e6284e6 sha256=3461fa42c1b2240ba4da1d985ca73503914157fc4c77417327ed6d7d85acdbe6 -md5=ced06e7d92d8a10c84db94589e7f8162 -cksum=2059529268 upstream_url=https://pypi.io/packages/source/c/cvxopt/cvxopt-VERSION.tar.gz diff --git a/build/pkgs/cvxpy/checksums.ini b/build/pkgs/cvxpy/checksums.ini index 7f4a8be2660..025278a9b01 100644 --- a/build/pkgs/cvxpy/checksums.ini +++ b/build/pkgs/cvxpy/checksums.ini @@ -1,6 +1,4 @@ tarball=cvxpy-VERSION.tar.gz sha1=1ca24d9e2ee5add13b33724ab9a11e747fe4ed99 sha256=7a9ef34e3c57ff8c844d86f0a3834fb5575af19233947639de0ba577c6122e3e -md5=da9fa9feb9634d3562057484b9822889 -cksum=1557666297 upstream_url=https://pypi.io/packages/source/c/cvxpy/cvxpy-VERSION.tar.gz diff --git a/build/pkgs/cycler/checksums.ini b/build/pkgs/cycler/checksums.ini index 3e9e8ce4657..c187b6b4cba 100644 --- a/build/pkgs/cycler/checksums.ini +++ b/build/pkgs/cycler/checksums.ini @@ -1,6 +1,4 @@ tarball=cycler-VERSION.tar.gz sha1=576c8605d33a8f70eccabf321ecc9e2fbdb9fb72 sha256=9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f -md5=4d0c25f418956e91c47163179682e0ef -cksum=2916957464 upstream_url=https://files.pythonhosted.org/packages/source/c/cycler/cycler-VERSION.tar.gz diff --git a/build/pkgs/cylp/checksums.ini b/build/pkgs/cylp/checksums.ini index 1d365e3da21..d4f3ea9867b 100644 --- a/build/pkgs/cylp/checksums.ini +++ b/build/pkgs/cylp/checksums.ini @@ -1,6 +1,4 @@ tarball=cylp-VERSION.tar.gz sha1=22398052ca88123b77e691a0045806a030c9b259 sha256=a7ee226caa274e190338da3d24314647df7e06599ab38cdd26c005d8b8258b16 -md5=ac00f775af15afcee1b7932144441ec0 -cksum=2746382211 upstream_url=https://pypi.io/packages/source/c/cylp/cylp-VERSION.tar.gz diff --git a/build/pkgs/cysignals/checksums.ini b/build/pkgs/cysignals/checksums.ini index f48f68ec111..6bf5ec53eaa 100644 --- a/build/pkgs/cysignals/checksums.ini +++ b/build/pkgs/cysignals/checksums.ini @@ -1,6 +1,4 @@ tarball=cysignals-VERSION.tar.gz sha1=76db7aa59d55e867c83b329c017382555253af43 sha256=0f1e321e55a07f901c86a36a1e4497f6ff9dfe700681d0130a38c36e4eb238c3 -md5=1837370e1d7f0b0acf1b97c3b7323b7d -cksum=4114189395 upstream_url=https://pypi.io/packages/source/c/cysignals/cysignals-VERSION.tar.gz diff --git a/build/pkgs/cython/checksums.ini b/build/pkgs/cython/checksums.ini index 18e9b8994b6..e3c5756d5ea 100644 --- a/build/pkgs/cython/checksums.ini +++ b/build/pkgs/cython/checksums.ini @@ -1,6 +1,4 @@ tarball=Cython-VERSION.tar.gz sha1=48f0535ce0b05e0e4ae4daa6a597a2cdd76274f5 sha256=fb299acf3a578573c190c858d49e0cf9d75f4bc49c3f24c5a63804997ef09213 -md5=94ab8466d9350a31cfef3a0853c2fea5 -cksum=2507297160 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz diff --git a/build/pkgs/d3js/checksums.ini b/build/pkgs/d3js/checksums.ini index f1b09da7d9d..5d155588954 100644 --- a/build/pkgs/d3js/checksums.ini +++ b/build/pkgs/d3js/checksums.ini @@ -1,5 +1,3 @@ tarball=d3js-VERSION.tar.gz sha1=2fd4da34ca9e645cf81bf914d289c21c7bb8c166 sha256=9c0120e72ac623fd8e0e9f9bec3f5998a523e822a26c86d4460c08172120c490 -md5=d859a120f1eaebb8b563f4598868c564 -cksum=527881311 diff --git a/build/pkgs/database_cremona_ellcurve/checksums.ini b/build/pkgs/database_cremona_ellcurve/checksums.ini index 709dddaea2a..8be593bb368 100644 --- a/build/pkgs/database_cremona_ellcurve/checksums.ini +++ b/build/pkgs/database_cremona_ellcurve/checksums.ini @@ -1,5 +1,3 @@ tarball=database_cremona_ellcurve-20190911.tar.bz2 sha1=db8f87a70cc4103d617e0989e393f1343cacae6d sha256=5d1d6aa35a95f9df123c87c1894791580d067444e1145bbd6ec20b4840f22053 -md5=9399e69983c44d801f2d5bd2f3769d98 -cksum=767500587 diff --git a/build/pkgs/database_cubic_hecke/checksums.ini b/build/pkgs/database_cubic_hecke/checksums.ini index 50d1b41b0fd..347eac4060a 100644 --- a/build/pkgs/database_cubic_hecke/checksums.ini +++ b/build/pkgs/database_cubic_hecke/checksums.ini @@ -1,6 +1,4 @@ tarball=database_cubic_hecke-VERSION.tar.gz sha1=f78ae31202fe077177f2c5059c028f9d40c20a46 sha256=1c45ea30431698b0604924172e7e934e65d7db7e381f4173197704030b0c3bce -md5=4f83516e155515f17ebd88c56bc0f31b -cksum=3948466130 upstream_url=https://pypi.io/packages/source/d/database_cubic_hecke/database_cubic_hecke-VERSION.tar.gz diff --git a/build/pkgs/database_jones_numfield/checksums.ini b/build/pkgs/database_jones_numfield/checksums.ini index 5ab09a9d42d..a64642fb00d 100644 --- a/build/pkgs/database_jones_numfield/checksums.ini +++ b/build/pkgs/database_jones_numfield/checksums.ini @@ -1,5 +1,3 @@ tarball=database_jones_numfield-VERSION.tar.gz sha1=f7b1c4c330ff6be47ade4ec7fc14df9cebe8e2a8 sha256=704d70101bc504bbdd2d7ac5847cb3bbc43e017c0ee163a9b4ab3ed2e572a001 -md5=a8da4f207235a1de980a23a06e1e6d76 -cksum=1843797635 diff --git a/build/pkgs/database_knotinfo/checksums.ini b/build/pkgs/database_knotinfo/checksums.ini index 6832193ac85..9bcedf63dfa 100644 --- a/build/pkgs/database_knotinfo/checksums.ini +++ b/build/pkgs/database_knotinfo/checksums.ini @@ -1,6 +1,4 @@ tarball=database_knotinfo-VERSION.tar.gz sha1=d32a5640c59c25d49ee72770aedfc6daac7c3d0e sha256=146506d11752ba10bdd2cc3d6fedb35f913ce44ccaca64c0ca17f5c2ede38ba1 -md5=2d4104feee05547b542b1d86dd0f7675 -cksum=2620016485 upstream_url=https://pypi.io/packages/source/d/database_knotinfo/database_knotinfo-VERSION.tar.gz diff --git a/build/pkgs/database_kohel/checksums.ini b/build/pkgs/database_kohel/checksums.ini index 720a1b22416..32d2321ad8b 100644 --- a/build/pkgs/database_kohel/checksums.ini +++ b/build/pkgs/database_kohel/checksums.ini @@ -1,5 +1,3 @@ tarball=database_kohel-VERSION.tar.gz sha1=ace5bed1eab66b4b0e9e74717cfcd8eb94c59d3f sha256=0e05b6ee5306862cffddd61b5b8635841307b8fee8787b69c29a0d55b0650860 -md5=5253b28e0a82f1fb88dc5cabb95ae578 -cksum=1736717427 diff --git a/build/pkgs/database_mutation_class/checksums.ini b/build/pkgs/database_mutation_class/checksums.ini index b5f0b590d84..96c903b6ccd 100644 --- a/build/pkgs/database_mutation_class/checksums.ini +++ b/build/pkgs/database_mutation_class/checksums.ini @@ -1,5 +1,3 @@ tarball=database_mutation_class-VERSION.tar.gz sha1=0e7eb2e89e1d4a612cb60e3d6be14d42f3e55678 sha256=5105eed820e469bc0645788e23a47ff19420d3e398f5866df1424a05c67ee067 -md5=8186b8f75eae76825399f3a9e6378c7b -cksum=364985299 diff --git a/build/pkgs/database_odlyzko_zeta/checksums.ini b/build/pkgs/database_odlyzko_zeta/checksums.ini index a74f4f2ef8f..ce22051cf58 100644 --- a/build/pkgs/database_odlyzko_zeta/checksums.ini +++ b/build/pkgs/database_odlyzko_zeta/checksums.ini @@ -1,5 +1,3 @@ tarball=database_odlyzko_zeta-VERSION.tar.bz2 sha1=97f586307d2f67a0a8594bd010602e2c4d5e0b4d sha256=8919f01992718b9bf5c0602dbf16dd9d6f58b141b25f67f5cfd59f6cd0f9a0d4 -md5=c93f63760540d5a787728a7a89ca2d9c -cksum=3293740202 diff --git a/build/pkgs/database_stein_watkins/checksums.ini b/build/pkgs/database_stein_watkins/checksums.ini index e0f56643d12..2d5044b8097 100644 --- a/build/pkgs/database_stein_watkins/checksums.ini +++ b/build/pkgs/database_stein_watkins/checksums.ini @@ -1,5 +1,3 @@ tarball=database_stein_watkins-VERSION.tar.gz sha1=eecfb07fe2693e4baf301a0759d018a8842aba4d sha256=00fd8610d6343968f853cfb49c4ed75fb2347a2953ea8d6d0fa0aa2a98d43f6f -md5=e2ac1794dfaa0fdd9e7d12132c894c66 -cksum=1440891220 diff --git a/build/pkgs/database_stein_watkins_mini/checksums.ini b/build/pkgs/database_stein_watkins_mini/checksums.ini index 78099b3651a..0b8179140a0 100644 --- a/build/pkgs/database_stein_watkins_mini/checksums.ini +++ b/build/pkgs/database_stein_watkins_mini/checksums.ini @@ -1,5 +1,3 @@ tarball=database_stein_watkins_mini-VERSION.tar.bz2 sha1=4979191668e7cc8490eda75044435519faab0f9c sha256=adacd565277629238a14fd7d52f35a7516dfcd1d8875cb0c480cb56bd2cbb875 -md5=24b2741b9e78449071624f79b7dd48b0 -cksum=3178425274 diff --git a/build/pkgs/database_symbolic_data/checksums.ini b/build/pkgs/database_symbolic_data/checksums.ini index 098ff2c7c45..f4c13ac4cd1 100644 --- a/build/pkgs/database_symbolic_data/checksums.ini +++ b/build/pkgs/database_symbolic_data/checksums.ini @@ -1,5 +1,3 @@ tarball=database_symbolic_data-VERSION.tar.bz2 sha1=5f8532dacae12f36813ea609c6f511016955d1ee sha256=97eb42d007296c9a41bce65ada5ebf84c9341eaeda0b35a060e2d327042eb7fe -md5=4b0162e2efe22c942970cf2deaa38700 -cksum=884432759 diff --git a/build/pkgs/dateutil/checksums.ini b/build/pkgs/dateutil/checksums.ini index 273a12bee93..1c7783ac8fd 100644 --- a/build/pkgs/dateutil/checksums.ini +++ b/build/pkgs/dateutil/checksums.ini @@ -1,6 +1,4 @@ tarball=python-dateutil-VERSION.tar.gz sha1=c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 sha256=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 -md5=5970010bb72452344df3d76a10281b65 -cksum=3093929984 upstream_url=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-VERSION.tar.gz diff --git a/build/pkgs/debugpy/checksums.ini b/build/pkgs/debugpy/checksums.ini index 55c3be8b7d9..9ffea011e6e 100644 --- a/build/pkgs/debugpy/checksums.ini +++ b/build/pkgs/debugpy/checksums.ini @@ -1,6 +1,4 @@ tarball=debugpy-VERSION.zip sha1=af611dc5c401424196c27363379fc483814efe26 sha256=12af2c55b419521e33d5fb21bd022df0b5eb267c3e178f1d374a63a2a6bdccd0 -md5=b4a6173035b58a0ad61561a4c5017885 -cksum=57995549 upstream_url=https://pypi.io/packages/source/d/debugpy/debugpy-VERSION.zip diff --git a/build/pkgs/decorator/checksums.ini b/build/pkgs/decorator/checksums.ini index 3be37bdfc4f..daaa14c6732 100644 --- a/build/pkgs/decorator/checksums.ini +++ b/build/pkgs/decorator/checksums.ini @@ -1,6 +1,4 @@ tarball=decorator-VERSION.tar.gz sha1=929f42916ac8a4aa973599d558768b8f1728db46 sha256=637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 -md5=a6b34700dcac8a4bb04efd55e99626c1 -cksum=4154678061 upstream_url=https://pypi.io/packages/source/d/decorator/decorator-VERSION.tar.gz diff --git a/build/pkgs/deformation/checksums.ini b/build/pkgs/deformation/checksums.ini index ae30176ec84..4c3b5eefad3 100644 --- a/build/pkgs/deformation/checksums.ini +++ b/build/pkgs/deformation/checksums.ini @@ -1,6 +1,4 @@ tarball=deformation-VERSION.tar.bz2 sha1=0f5fd78a91da207d06b5be59bf466f16c2614eda sha256=100dc7a28638b0a06227d07d2c1d1f872c65f9828e451e34e947aed109abbfcb -md5=e2c365e20778117d402fb664fc145d72 -cksum=3789646827 upstream_url=https://github.com/sagemath/deformation/archive/refs/tags/VERSION.tar.gz diff --git a/build/pkgs/defusedxml/checksums.ini b/build/pkgs/defusedxml/checksums.ini index 1a6fa08a9a6..a6da3a2e278 100644 --- a/build/pkgs/defusedxml/checksums.ini +++ b/build/pkgs/defusedxml/checksums.ini @@ -1,6 +1,4 @@ tarball=defusedxml-VERSION.tar.gz sha1=37667af1dc1357eb96b005c4f408ad5292d77b9f sha256=1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69 -md5=a50e7f21aa60a741efe6b1b658dfb3f8 -cksum=3442371004 upstream_url=https://pypi.io/packages/source/d/defusedxml/defusedxml-VERSION.tar.gz diff --git a/build/pkgs/distlib/checksums.ini b/build/pkgs/distlib/checksums.ini index 3222f6b40c1..bd456ec2028 100644 --- a/build/pkgs/distlib/checksums.ini +++ b/build/pkgs/distlib/checksums.ini @@ -1,6 +1,4 @@ tarball=distlib-VERSION-py2.py3-none-any.whl sha1=97ea3bb71040f0348eaea272ec17fefea5806e87 sha256=034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 -md5=cf336842ba81996e554ae4eb2cd76d5d -cksum=3779817199 upstream_url=https://pypi.io/packages/py2.py3/d/distlib/distlib-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/docutils/checksums.ini b/build/pkgs/docutils/checksums.ini index e59aeba02d2..ebcc15cc5a1 100644 --- a/build/pkgs/docutils/checksums.ini +++ b/build/pkgs/docutils/checksums.ini @@ -1,6 +1,4 @@ tarball=docutils-VERSION-py3-none-any.whl sha1=2bac2b2e9f4cc6d832588457c5f69bac79d80239 sha256=96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6 -md5=1d4506ff10777551614a128872523dfb -cksum=2147344904 upstream_url=https://pypi.io/packages/py3/d/docutils/docutils-VERSION-py3-none-any.whl diff --git a/build/pkgs/dot2tex/checksums.ini b/build/pkgs/dot2tex/checksums.ini index 0f4cd10a8cd..c13d6f3489c 100644 --- a/build/pkgs/dot2tex/checksums.ini +++ b/build/pkgs/dot2tex/checksums.ini @@ -1,5 +1,3 @@ tarball=dot2tex-VERSION.tar.gz sha1=5149c76e817b0592ea4dfd03f899495a394b8e90 sha256=e7205ed17edf7e8a7a816f13da5c74fd8b88e1ad42cc3975a6943a32f59ad55b -md5=b9ae1b7939409df221209098aaf11c97 -cksum=557736523 diff --git a/build/pkgs/dsdp/checksums.ini b/build/pkgs/dsdp/checksums.ini index 4a674b278b2..da43d10edb8 100644 --- a/build/pkgs/dsdp/checksums.ini +++ b/build/pkgs/dsdp/checksums.ini @@ -1,6 +1,4 @@ tarball=dsdp_VERSION.orig.tar.gz sha1=d80b072acf5396561809266ff1c93e7927697aeb sha256=de82af5e2daec70c8bf653ea4872108850bebea25238a799e78289ff88f88e06 -md5=7f49a35f3fe7b5802d29ee2435fdb67e -cksum=955095458 upstream_url=http://deb.debian.org/debian/pool/main/d/dsdp/dsdp_VERSION.orig.tar.gz diff --git a/build/pkgs/e_antic/checksums.ini b/build/pkgs/e_antic/checksums.ini index 850eccd27b3..f0afbce6ac8 100644 --- a/build/pkgs/e_antic/checksums.ini +++ b/build/pkgs/e_antic/checksums.ini @@ -1,6 +1,4 @@ tarball=e-antic-VERSION.tar.gz sha1=587052e189f9a7a145ac3144e6b7f11fca54b1ff sha256=a38d2ab62c1b00fa2ee78f39039cc4d9d8e83de5fa5e2a18529ad34ab8976fe1 -md5=0b54042461b28c4b45239480af062546 -cksum=589498373 upstream_url=https://github.com/flatsurf/e-antic/releases/download/VERSION/e-antic-VERSION.tar.gz diff --git a/build/pkgs/ecl/checksums.ini b/build/pkgs/ecl/checksums.ini index 7342d5d6b73..169baeb6d6b 100644 --- a/build/pkgs/ecl/checksums.ini +++ b/build/pkgs/ecl/checksums.ini @@ -1,6 +1,4 @@ tarball=ecl-VERSION.tgz sha1=612f61f87eedb271025095306eca78d19f3991db sha256=c51bdab4ca6c1173dd3fe9cfe9727bcefb97bb0a3d6434b627ca6bdaeb33f880 -md5=16bcfd2ce9730691f88e74edaab790af -cksum=1542706373 upstream_url=https://common-lisp.net/project/ecl/static/files/release/ecl-VERSION.tgz diff --git a/build/pkgs/eclib/checksums.ini b/build/pkgs/eclib/checksums.ini index 8bab8e64a6b..fde4faaee15 100644 --- a/build/pkgs/eclib/checksums.ini +++ b/build/pkgs/eclib/checksums.ini @@ -1,6 +1,4 @@ tarball=eclib-VERSION.tar.bz2 sha1=3028ac95e1b76699f5f9e871ac706cda363ab842 sha256=32d116a3e359b0de4f6486c2bb6188bb8b553c8b833f618cc2596484e8b6145a -md5=c96e1bb39a50552aeac6675b907709b8 -cksum=2027019032 upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2 diff --git a/build/pkgs/ecm/checksums.ini b/build/pkgs/ecm/checksums.ini index 4c3906b7810..f2221539308 100644 --- a/build/pkgs/ecm/checksums.ini +++ b/build/pkgs/ecm/checksums.ini @@ -1,6 +1,4 @@ tarball=ecm-VERSION.tar.gz sha1=f35d225d1d44f9b8ad420bf9b50a92582f681337 sha256=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8 -md5=cfbb789d76cf538fc4dbb99d8e6e4b81 -cksum=2195620014 upstream_url=https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-VERSION.tar.gz diff --git a/build/pkgs/ecos_python/checksums.ini b/build/pkgs/ecos_python/checksums.ini index 9a58eff09af..1b5791948e7 100644 --- a/build/pkgs/ecos_python/checksums.ini +++ b/build/pkgs/ecos_python/checksums.ini @@ -1,6 +1,4 @@ tarball=ecos-VERSION.tar.gz sha1=7afce63aec44522052e05fa2e1c82e12fe20fd45 sha256=f48816d73b87ae325556ea537b7c8743187311403c80e3832035224156337c4e -md5=a76939695aa07f8ab2f01a532732f348 -cksum=2810151369 upstream_url=https://pypi.io/packages/source/e/ecos/ecos-VERSION.tar.gz diff --git a/build/pkgs/editables/checksums.ini b/build/pkgs/editables/checksums.ini index f61e33020aa..68682c1b05c 100644 --- a/build/pkgs/editables/checksums.ini +++ b/build/pkgs/editables/checksums.ini @@ -1,6 +1,4 @@ tarball=editables-VERSION.tar.gz sha1=90efed858e78bf6276d1a5959ec6692e11a6bce9 sha256=309627d9b5c4adc0e668d8c6fa7bac1ba7c8c5d415c2d27f60f081f8e80d1de2 -md5=520de8c3a9dc5dfb2b365d104541c9de -cksum=3074203672 upstream_url=https://pypi.io/packages/source/e/editables/editables-VERSION.tar.gz diff --git a/build/pkgs/elliptic_curves/checksums.ini b/build/pkgs/elliptic_curves/checksums.ini index fdd2cab5516..687b7ae0e04 100644 --- a/build/pkgs/elliptic_curves/checksums.ini +++ b/build/pkgs/elliptic_curves/checksums.ini @@ -1,5 +1,3 @@ tarball=elliptic_curves-VERSION.tar.bz2 sha1=1eb0d332be1d05aaee70cd03cce7299a1df95953 sha256=5fba5470d9d91f06282ed5edfc45bf0ea1c5f7c8d4837c46234b17be1481fd50 -md5=315564f43d9272a2659f91355e6b1d16 -cksum=3923089644 diff --git a/build/pkgs/entrypoints/checksums.ini b/build/pkgs/entrypoints/checksums.ini index 1b14748354d..60bb1387477 100644 --- a/build/pkgs/entrypoints/checksums.ini +++ b/build/pkgs/entrypoints/checksums.ini @@ -1,6 +1,4 @@ tarball=entrypoints-VERSION.tar.gz sha1=ca5c5976781db7ec6e8faece06af31ff32960529 sha256=b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4 -md5=3acd8b72119a8fb1eac7030c24ac6b49 -cksum=3193499805 upstream_url=https://pypi.io/packages/source/e/entrypoints/entrypoints-VERSION.tar.gz diff --git a/build/pkgs/exceptiongroup/checksums.ini b/build/pkgs/exceptiongroup/checksums.ini index ef8db57925c..ef04b565062 100644 --- a/build/pkgs/exceptiongroup/checksums.ini +++ b/build/pkgs/exceptiongroup/checksums.ini @@ -1,6 +1,4 @@ tarball=exceptiongroup-VERSION-py3-none-any.whl sha1=e69c438e6d15111c4f7cc18224b31a42a58663da sha256=4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14 -md5=d252c64173c449dc34654e7be8211744 -cksum=527795480 upstream_url=https://pypi.io/packages/py3/e/exceptiongroup/exceptiongroup-VERSION-py3-none-any.whl diff --git a/build/pkgs/executing/checksums.ini b/build/pkgs/executing/checksums.ini index fb9ab40fb18..5add559f690 100644 --- a/build/pkgs/executing/checksums.ini +++ b/build/pkgs/executing/checksums.ini @@ -1,6 +1,4 @@ tarball=executing-VERSION.tar.gz sha1=ac9b0cbedd1166bce7a3b9f8542f8d1fafdd8c73 sha256=19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 -md5=e6fa9a6abf00555ccc8a6b3524729238 -cksum=1761713270 upstream_url=https://pypi.io/packages/source/e/executing/executing-VERSION.tar.gz diff --git a/build/pkgs/fastjsonschema/checksums.ini b/build/pkgs/fastjsonschema/checksums.ini index 37a25ce9db0..ae58c4c8577 100644 --- a/build/pkgs/fastjsonschema/checksums.ini +++ b/build/pkgs/fastjsonschema/checksums.ini @@ -1,6 +1,4 @@ tarball=fastjsonschema-VERSION.tar.gz sha1=eab76262783dd81303e2b1da0914a1d5a7f388aa sha256=e820349dd16f806e4bd1467a138dced9def4bc7d6213a34295272a6cac95b5bd -md5=4dd3d7946af566fc32e30f0768cddae3 -cksum=2794560071 upstream_url=https://pypi.io/packages/source/f/fastjsonschema/fastjsonschema-VERSION.tar.gz diff --git a/build/pkgs/fflas_ffpack/checksums.ini b/build/pkgs/fflas_ffpack/checksums.ini index 25108e7990e..7a9d11351eb 100644 --- a/build/pkgs/fflas_ffpack/checksums.ini +++ b/build/pkgs/fflas_ffpack/checksums.ini @@ -1,5 +1,3 @@ tarball=fflas_ffpack-VERSION.tar.bz2 sha1=c221513710b98e0e62153f424a9725c5be2ff62a sha256=d4ecfc6289c7077185ed5e58fa77d07fdb034c1a74385366566226a4887c50c3 -md5=05c77ea30394cacd53b7aed6ffba1e7b -cksum=3775757878 diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini index 441476e39c2..330f4d53a36 100644 --- a/build/pkgs/filelock/checksums.ini +++ b/build/pkgs/filelock/checksums.ini @@ -1,6 +1,4 @@ tarball=filelock-VERSION-py3-none-any.whl sha1=f1fa92751023660a10b248f8559d09f3c461403f sha256=57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c -md5=d0af0f1a2ee56c24f630ece278cb062f -cksum=3749691502 upstream_url=https://pypi.io/packages/py3/f/filelock/filelock-VERSION-py3-none-any.whl diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index 76e95967041..07939f5d909 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,6 +1,4 @@ tarball=flint-VERSION.tar.gz sha1=65be9297c06edd7e24f20874b7bd6130cee56723 sha256=7b311a00503a863881eb8177dbeb84322f29399f3d7d72f3b1a4c9ba1d5794b4 -md5=5189f67b0ec12e4a54d6782851642b81 -cksum=172350473 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz diff --git a/build/pkgs/flit_core/checksums.ini b/build/pkgs/flit_core/checksums.ini index a8043a35077..0a40b9891b2 100644 --- a/build/pkgs/flit_core/checksums.ini +++ b/build/pkgs/flit_core/checksums.ini @@ -1,6 +1,4 @@ tarball=flit_core-VERSION-py3-none-any.whl sha1=cf044db53e986d0735ad708cce9eba0b71684168 sha256=7aada352fb0c7f5538c4fafeddf314d3a6a92ee8e2b1de70482329e42de70301 -md5=c817750ae741d8f720b173a30f7b2085 -cksum=1810686358 upstream_url=https://pypi.io/packages/py3/f/flit_core/flit_core-VERSION-py3-none-any.whl diff --git a/build/pkgs/fonttools/checksums.ini b/build/pkgs/fonttools/checksums.ini index 39bbfbdfc88..7cb3b54ce86 100644 --- a/build/pkgs/fonttools/checksums.ini +++ b/build/pkgs/fonttools/checksums.ini @@ -1,6 +1,4 @@ tarball=fonttools-VERSION.tar.gz sha1=5432f0273040b044e8d6465947e3a4c00097bdbf sha256=c391cd5af88aacaf41dd7cfb96eeedfad297b5899a39e12f4c2c3706d0a3329d -md5=039956b85e9b84ba53373b0df644f5ad -cksum=3441365368 upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.tar.gz diff --git a/build/pkgs/fplll/checksums.ini b/build/pkgs/fplll/checksums.ini index 4daa8f39890..7ad5ac91a3b 100644 --- a/build/pkgs/fplll/checksums.ini +++ b/build/pkgs/fplll/checksums.ini @@ -1,6 +1,4 @@ tarball=fplll-VERSION.tar.gz sha1=607f5922109d93ddd5a05419682511e26579f9d6 sha256=76d3778f0326597ed7505bab19493a9bf6b73a5c5ca614e8fb82f42105c57d00 -md5=fa4e1f24994c0345a9530397a3369b27 -cksum=4174005926 upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz diff --git a/build/pkgs/fpylll/checksums.ini b/build/pkgs/fpylll/checksums.ini index ad9d2a83f7b..5cbc7e3bc08 100644 --- a/build/pkgs/fpylll/checksums.ini +++ b/build/pkgs/fpylll/checksums.ini @@ -1,6 +1,4 @@ tarball=fpylll-VERSION.tar.gz sha1=f23835208fc048028c849bb5b566f2fe631df7f4 sha256=623b4619b6da9fed9ba26b1ac7e8d8e620a06d2a5f7095ee67985c7160d3c3a4 -md5=c81a1af8ecf57ae740366a110dfbbbaf -cksum=398170701 upstream_url=https://pypi.io/packages/source/f/fpylll/fpylll-VERSION.tar.gz diff --git a/build/pkgs/fqdn/checksums.ini b/build/pkgs/fqdn/checksums.ini index 97ca12a5d73..2e3cdea93c6 100644 --- a/build/pkgs/fqdn/checksums.ini +++ b/build/pkgs/fqdn/checksums.ini @@ -1,6 +1,4 @@ tarball=fqdn-VERSION-py3-none-any.whl sha1=85a7ac7d7f45d2e0b64c4b7653ab277ceec91ecf sha256=3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014 -md5=376c19af0cd5029cd8b36d1042a1490e -cksum=4276482151 upstream_url=https://pypi.io/packages/py3/f/fqdn/fqdn-VERSION-py3-none-any.whl diff --git a/build/pkgs/freetype/checksums.ini b/build/pkgs/freetype/checksums.ini index eff2e1130f7..150769930c2 100644 --- a/build/pkgs/freetype/checksums.ini +++ b/build/pkgs/freetype/checksums.ini @@ -1,6 +1,4 @@ tarball=freetype-VERSION.tar.bz2 sha1=040d6a4be23708132c85ef9df837eb3f8a04c4ab sha256=5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac -md5=4934a8b61b636920bcce58e7c7f3e1a2 -cksum=2814275332 upstream_url=https://download.savannah.gnu.org/releases/freetype/freetype-VERSION.tar.gz diff --git a/build/pkgs/fricas/checksums.ini b/build/pkgs/fricas/checksums.ini index 0e89a270d86..89f86b4e03d 100644 --- a/build/pkgs/fricas/checksums.ini +++ b/build/pkgs/fricas/checksums.ini @@ -1,6 +1,4 @@ tarball=fricas-VERSION-full.tar.bz2 sha1=6f2c1ae5eb71daab871d1814b26f596363c8e925 sha256=6a60063cb428ef49ca013c9933b877c97e66314c42c0e1706ff7d32160798544 -md5=504b431c39e498527e6f9c739c973488 -cksum=2469663675 upstream_url=https://github.com/fricas/fricas/releases/download/VERSION/fricas-VERSION-full.tar.bz2 diff --git a/build/pkgs/frobby/checksums.ini b/build/pkgs/frobby/checksums.ini index 82d050eb088..ebdefdefd9c 100644 --- a/build/pkgs/frobby/checksums.ini +++ b/build/pkgs/frobby/checksums.ini @@ -1,5 +1,3 @@ tarball=frobby_v0.9.0.tar.gz sha1=513b6e2ef8e8670c0518d168c2e554df1f8d79b4 sha256=af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df -md5=2204f340dad8fb7be156f9f7c403c4a0 -cksum=2889611419 diff --git a/build/pkgs/furo/checksums.ini b/build/pkgs/furo/checksums.ini index 27b7f0f1903..b6feae79dad 100644 --- a/build/pkgs/furo/checksums.ini +++ b/build/pkgs/furo/checksums.ini @@ -1,6 +1,4 @@ tarball=furo-VERSION-py3-none-any.whl sha1=21afca1ac0f309541bfd5b89e61097a1bd4b681e sha256=513092538537dc5c596691da06e3c370714ec99bc438680edc1debffb73e5bfc -md5=a7c552d8bc7b504b528414043f91671b -cksum=2089555908 upstream_url=https://pypi.io/packages/py3/f/furo/furo-VERSION-py3-none-any.whl diff --git a/build/pkgs/gambit/checksums.ini b/build/pkgs/gambit/checksums.ini index b33d63f512e..9e197bfb331 100644 --- a/build/pkgs/gambit/checksums.ini +++ b/build/pkgs/gambit/checksums.ini @@ -1,5 +1,3 @@ tarball=gambit-VERSION.tar.gz sha1=603dd52e8c0c2881bc2fdc8523bd8cbd9106b36f sha256=7ede51739dc868242886815bb875307f5e11bb3789f22c546d3c83194fe75a1c -md5=db47a02f66644806dbd43f77dc41ebeb -cksum=2352708160 diff --git a/build/pkgs/gap/checksums.ini b/build/pkgs/gap/checksums.ini index fcf5ab4e8ce..2b1170e52d9 100644 --- a/build/pkgs/gap/checksums.ini +++ b/build/pkgs/gap/checksums.ini @@ -1,6 +1,4 @@ tarball=gap-VERSION.tar.gz sha1=a6e36f3f874a2c46f51561402634497eab705cca sha256=672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8 -md5=c5cd9f272f2703d7a3649ad7193b2d90 -cksum=2760477284 upstream_url=https://github.com/gap-system/gap/releases/download/vVERSION/gap-VERSION.tar.gz diff --git a/build/pkgs/gap3/checksums.ini b/build/pkgs/gap3/checksums.ini index 354babc8065..1d5e624ad83 100644 --- a/build/pkgs/gap3/checksums.ini +++ b/build/pkgs/gap3/checksums.ini @@ -1,5 +1,3 @@ tarball=gap3-VERSION.tar.gz sha1=c730fb20e850fc5d4ac98569d717d20967e88086 sha256=07d90b63f504c67bb463fad470544d18619e25539fec7cfb74343a1a982d3b75 -md5=edc04e9080e4b020400deb5d90e5a528 -cksum=3976232974 diff --git a/build/pkgs/gap_jupyter/checksums.ini b/build/pkgs/gap_jupyter/checksums.ini index 8722b3103b1..e873f263973 100644 --- a/build/pkgs/gap_jupyter/checksums.ini +++ b/build/pkgs/gap_jupyter/checksums.ini @@ -1,5 +1,3 @@ tarball=jupyter-kernel-gap-VERSION.tar.gz sha1=9536aa352c6dee815ae5179e3971bfb9216f8eda sha256=8c62f3c290ac6eea94e4f1d35067b74261eea67c400b0aaa8d1f9451df0e963f -md5=f5853cc8cd62ce495be8d3c8bdb2500f -cksum=3578940226 diff --git a/build/pkgs/gast/checksums.ini b/build/pkgs/gast/checksums.ini index 04bcc2ff13a..6035bc7c22d 100644 --- a/build/pkgs/gast/checksums.ini +++ b/build/pkgs/gast/checksums.ini @@ -1,6 +1,4 @@ tarball=gast-VERSION.tar.gz sha1=6c113cf8d33cc654d33210335103485ab41d3dbb sha256=9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97 -md5=907c689e3fdbc7a48cc010e665195baa -cksum=218846575 upstream_url=https://pypi.io/packages/source/g/gast/gast-VERSION.tar.gz diff --git a/build/pkgs/gc/checksums.ini b/build/pkgs/gc/checksums.ini index 83651e93f3e..38629d95df8 100644 --- a/build/pkgs/gc/checksums.ini +++ b/build/pkgs/gc/checksums.ini @@ -1,6 +1,4 @@ tarball=gc-VERSION.tar.gz sha1=41c88cbc4bc9bf76e1a95a1500ea5b0360bc4f55 sha256=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2 -md5=8901a6ed29ac35842420054772ea3441 -cksum=4201205407 upstream_url=https://github.com/ivmai/bdwgc/releases/download/vVERSION/gc-VERSION.tar.gz diff --git a/build/pkgs/gcc/checksums.ini b/build/pkgs/gcc/checksums.ini index 6be034ebf90..fa544d273cf 100644 --- a/build/pkgs/gcc/checksums.ini +++ b/build/pkgs/gcc/checksums.ini @@ -1,6 +1,4 @@ tarball=gcc-VERSION.tar.xz sha1=5dce6dc0091b8049b530d1587513a07201691760 sha256=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff -md5=73bafd0af874439dcdb9fc063b6fb069 -cksum=2807184004 upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz diff --git a/build/pkgs/gdb/checksums.ini b/build/pkgs/gdb/checksums.ini index 3b6841b8947..ce68044ec98 100644 --- a/build/pkgs/gdb/checksums.ini +++ b/build/pkgs/gdb/checksums.ini @@ -1,5 +1,3 @@ tarball=gdb-VERSION.tar.xz sha1=ee66294d87a109f88a459d0da5d0bb2da5135f45 sha256=c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39 -md5=b5a49dbff00d9a87fbe114d14b3101c0 -cksum=4115301181 diff --git a/build/pkgs/gengetopt/checksums.ini b/build/pkgs/gengetopt/checksums.ini index a4d02cde58b..0aeeecf07db 100644 --- a/build/pkgs/gengetopt/checksums.ini +++ b/build/pkgs/gengetopt/checksums.ini @@ -1,6 +1,4 @@ tarball=gengetopt-VERSION.tar.xz sha1=0d5979af61a7be309898608803056aeebe3a3657 sha256=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac -md5=ea165d618640dbdecb42ae4491337965 -cksum=3423561524 upstream_url=ftp://ftp.gnu.org/gnu/gengetopt/gengetopt-VERSION.tar.xz diff --git a/build/pkgs/gf2x/checksums.ini b/build/pkgs/gf2x/checksums.ini index 31fcf534c50..65a9e1dee12 100644 --- a/build/pkgs/gf2x/checksums.ini +++ b/build/pkgs/gf2x/checksums.ini @@ -1,6 +1,4 @@ tarball=gf2x-VERSION.tar.gz sha1=1b9c7e14031afc5488b9aa27f5501f78c90f00b4 sha256=9472cd651972a1de38e3c4c47697a86e0ecf19d7d33454d4bc2a62bc85841b59 -md5=842f087ce423c279dced26b85b0fd1d0 -cksum=3368093312 upstream_url=https://gitlab.inria.fr/gf2x/gf2x/uploads/c46b1047ba841c20d1225ae73ad6e4cd/gf2x-VERSION.tar.gz diff --git a/build/pkgs/gfan/checksums.ini b/build/pkgs/gfan/checksums.ini index 21ede700e5e..b7c61823e3d 100644 --- a/build/pkgs/gfan/checksums.ini +++ b/build/pkgs/gfan/checksums.ini @@ -1,5 +1,3 @@ tarball=gfanVERSION.tar.gz sha1=5649d22e01da8c5c90d5adac2c601e6dfe71c568 sha256=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a -md5=b518358c7a399075ff6dd658885382c8 -cksum=3811041742 diff --git a/build/pkgs/giac/checksums.ini b/build/pkgs/giac/checksums.ini index 930026d75d1..eea2eb82dba 100644 --- a/build/pkgs/giac/checksums.ini +++ b/build/pkgs/giac/checksums.ini @@ -1,5 +1,3 @@ tarball=giac-VERSION.tar.bz2 sha1=78c15badd19b49b7d111ac204b611a4378ce3d15 sha256=aa5dbefd4b410012a61756904d6dc1c186a4719db414a2ad7cf876ae933ff96b -md5=8fbd43a5c60848b6813b7fc8698a0199 -cksum=1923149665 diff --git a/build/pkgs/givaro/checksums.ini b/build/pkgs/givaro/checksums.ini index 9af27bf5629..ac9d04b9d3a 100644 --- a/build/pkgs/givaro/checksums.ini +++ b/build/pkgs/givaro/checksums.ini @@ -1,5 +1,3 @@ tarball=givaro-VERSION.tar.gz sha1=2e7af1537d6f8325578a54d5b8092c990028863d sha256=628049899386e91da245aee6cd446350fbca87e94863bc0d815066c08150487f -md5=b27c7713fcdced257df5f17b7bec8fd5 -cksum=731010730 diff --git a/build/pkgs/glpk/checksums.ini b/build/pkgs/glpk/checksums.ini index 48d314fe29e..eb53383e7ae 100644 --- a/build/pkgs/glpk/checksums.ini +++ b/build/pkgs/glpk/checksums.ini @@ -1,6 +1,4 @@ tarball=glpk-VERSION.tar.bz2 sha1=3a85b1e4c806b91deebfcf9a845b9308cd785d64 sha256=4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15 -md5=91499dc0c139b221846cae60e5c7d222 -cksum=1522314071 upstream_url=https://ftp.gnu.org/gnu/glpk/glpk-VERSION.tar.gz diff --git a/build/pkgs/glucose/checksums.ini b/build/pkgs/glucose/checksums.ini index 582c93faaf4..902484c9f30 100644 --- a/build/pkgs/glucose/checksums.ini +++ b/build/pkgs/glucose/checksums.ini @@ -1,5 +1,3 @@ tarball=glucose-syrup-VERSION.tgz sha1=5442dff37b8ea113b572bffa27a19314af14a137 sha256=51aa1cf1bed2b14f1543b099e85a56dd1a92be37e6e3eb0c4a1fd883d5cc5029 -md5=7f13be91b3cd71bd02d4f37570fee011 -cksum=3190126613 diff --git a/build/pkgs/gmp/checksums.ini b/build/pkgs/gmp/checksums.ini index b7bf83ce179..da58132ff25 100644 --- a/build/pkgs/gmp/checksums.ini +++ b/build/pkgs/gmp/checksums.ini @@ -1,6 +1,4 @@ tarball=gmp-VERSION.tar.xz sha1=b4043dd2964ab1a858109da85c44de224384f352 sha256=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898 -md5=956dc04e864001a9c22429f761f2c283 -cksum=1735788654 upstream_url=https://gmplib.org/download/gmp/gmp-VERSION.tar.xz diff --git a/build/pkgs/gmpy2/checksums.ini b/build/pkgs/gmpy2/checksums.ini index 39500add526..34824279321 100644 --- a/build/pkgs/gmpy2/checksums.ini +++ b/build/pkgs/gmpy2/checksums.ini @@ -1,6 +1,4 @@ tarball=gmpy2-VERSION.tar.gz sha1=700ef438964acd286d52e973a833cd57ae9a7ad7 sha256=3b8acc939a40411a8ad5541ed178ff866dd1759e667ee26fe34c9291b6b350c3 -md5=72b93048015b28efcf92ed702014a61c -cksum=3542820546 upstream_url=https://pypi.io/packages/source/g/gmpy2/gmpy2-VERSION.tar.gz diff --git a/build/pkgs/gnumake_tokenpool/checksums.ini b/build/pkgs/gnumake_tokenpool/checksums.ini index 3d0447bc540..889f64341f2 100644 --- a/build/pkgs/gnumake_tokenpool/checksums.ini +++ b/build/pkgs/gnumake_tokenpool/checksums.ini @@ -1,6 +1,4 @@ tarball=gnumake_tokenpool-VERSION-py3-none-any.whl sha1=882c694dc3c0a935275a8d2acd9e766399719754 sha256=0c49578df1a76b6ff7724b99053d96f1583bd3e52fe9547587cfb6ffdb0d1fcd -md5=cc18b6c7a339d8140f5b2dc248ef24bc -cksum=2989045922 upstream_url=https://pypi.io/packages/py3/g/gnumake_tokenpool/gnumake_tokenpool-VERSION-py3-none-any.whl diff --git a/build/pkgs/gp2c/checksums.ini b/build/pkgs/gp2c/checksums.ini index b7876120c73..198917ec563 100644 --- a/build/pkgs/gp2c/checksums.ini +++ b/build/pkgs/gp2c/checksums.ini @@ -1,5 +1,3 @@ tarball=gp2c-VERSION.tar.gz sha1=6bce2bbb69227de44fa768619d1dffa861d6470a sha256=e0f89183ae4ea24fc41e1da3df3cca11e4f7061237cee0553082c7806ef917f6 -md5=41d3e76fb070ba7f73242b76ae5cb529 -cksum=2256538341 diff --git a/build/pkgs/graphs/checksums.ini b/build/pkgs/graphs/checksums.ini index 0e13b75d34b..002c07affac 100644 --- a/build/pkgs/graphs/checksums.ini +++ b/build/pkgs/graphs/checksums.ini @@ -1,6 +1,4 @@ tarball=graphs-VERSION.tar.bz2 sha1=c3b9fcbc92482efd6b7f6f3a33df5a78e1256aa1 sha256=07237c0d9853611505c389fd7bb92500c8743f5631babb4d0f45dfd8332f3741 -md5=4357919410e8ac2611c9fe643976c8ff -cksum=2340933149 upstream_url=http://users.ox.ac.uk/~coml0531/sage/graphs-VERSION.tar.bz2 diff --git a/build/pkgs/gsl/checksums.ini b/build/pkgs/gsl/checksums.ini index 9b3176c71c6..bfa1139780a 100644 --- a/build/pkgs/gsl/checksums.ini +++ b/build/pkgs/gsl/checksums.ini @@ -1,6 +1,4 @@ tarball=gsl-VERSION.tar.gz sha1=549e1105cd1198537be9707257161531e109bd94 sha256=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b -md5=36aee97e67f64dbdab7afae197e3483b -cksum=171022903 upstream_url=https://ftp.gnu.org/gnu/gsl/gsl-VERSION.tar.gz diff --git a/build/pkgs/h11/checksums.ini b/build/pkgs/h11/checksums.ini index 147c2a48f28..8e1952d648a 100644 --- a/build/pkgs/h11/checksums.ini +++ b/build/pkgs/h11/checksums.ini @@ -1,6 +1,4 @@ tarball=h11-VERSION-py3-none-any.whl sha1=c502d56dc3288212142a398704a5109749331dd8 sha256=e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761 -md5=47f19bfed53c8f9278749c532490977e -cksum=462065947 upstream_url=https://pypi.io/packages/py3/h/h11/h11-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini index 5e4a296724f..719a65f9a82 100644 --- a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini +++ b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini @@ -1,6 +1,4 @@ tarball=hatch_fancy_pypi_readme-VERSION-py3-none-any.whl sha1=4076ea14577b3c711a8345498d8f91b1c8a13d09 sha256=9a2c0e5d527611701858083bfb355876f26e04a075342b7d4da725ba5a6dd6ea -md5=d7acd13333f6c71dcbfa62420c7f257b -cksum=1527082323 upstream_url=https://pypi.io/packages/py3/h/hatch_fancy_pypi_readme/hatch_fancy_pypi_readme-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatch_vcs/checksums.ini b/build/pkgs/hatch_vcs/checksums.ini index 9d9c791717d..dcfa6ea3e03 100644 --- a/build/pkgs/hatch_vcs/checksums.ini +++ b/build/pkgs/hatch_vcs/checksums.ini @@ -1,6 +1,4 @@ tarball=hatch_vcs-VERSION-py3-none-any.whl sha1=a4da813bf9a745ed2020bf462f4bc19a1ab7fc11 sha256=b8a2b6bee54cf6f9fc93762db73890017ae59c9081d1038a41f16235ceaf8b2c -md5=82bee9889b95170e550c98f8dd11bc61 -cksum=1575327634 upstream_url=https://pypi.io/packages/py3/h/hatch_vcs/hatch_vcs-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatchling/checksums.ini b/build/pkgs/hatchling/checksums.ini index cc5f435bae5..2cc02150b5d 100644 --- a/build/pkgs/hatchling/checksums.ini +++ b/build/pkgs/hatchling/checksums.ini @@ -1,6 +1,4 @@ tarball=hatchling-VERSION-py3-none-any.whl sha1=aa9d69b9dd820716440252d737a4aeaf9b4e541f sha256=872c63aa7e8aca85e8dba07b05c6a9b28d5a149fe00638f1a47e36930197248f -md5=20e5ea4deea21f91759fb2269b71f0dd -cksum=446304413 upstream_url=https://pypi.io/packages/py3/h/hatchling/hatchling-VERSION-py3-none-any.whl diff --git a/build/pkgs/httpcore/checksums.ini b/build/pkgs/httpcore/checksums.ini index f4b275c790f..627dc72c115 100644 --- a/build/pkgs/httpcore/checksums.ini +++ b/build/pkgs/httpcore/checksums.ini @@ -1,6 +1,4 @@ tarball=httpcore-VERSION-py3-none-any.whl sha1=e83eb30232906df8ac673d6c49c657957dc00ce1 sha256=ac418c1db41bade2ad53ae2f3834a3a0f5ae76b56cf5aa497d2d033384fc7d73 -md5=9f99e1b4ed8ba940bd698e21af54ef6d -cksum=2564019022 upstream_url=https://pypi.io/packages/py3/h/httpcore/httpcore-VERSION-py3-none-any.whl diff --git a/build/pkgs/httpx/checksums.ini b/build/pkgs/httpx/checksums.ini index d4363d5f6ad..adc2d9ae791 100644 --- a/build/pkgs/httpx/checksums.ini +++ b/build/pkgs/httpx/checksums.ini @@ -1,6 +1,4 @@ tarball=httpx-VERSION-py3-none-any.whl sha1=01f2a657e43842cb7c8dda30d38860fa741acb7e sha256=71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 -md5=9bab916547b4c85999c568d12e04edc4 -cksum=4048488492 upstream_url=https://pypi.io/packages/py3/h/httpx/httpx-VERSION-py3-none-any.whl diff --git a/build/pkgs/idna/checksums.ini b/build/pkgs/idna/checksums.ini index ae983bf54b7..0381d537291 100644 --- a/build/pkgs/idna/checksums.ini +++ b/build/pkgs/idna/checksums.ini @@ -1,6 +1,4 @@ tarball=idna-VERSION-py3-none-any.whl sha1=352c6bd8ee12319953116397718c1a8ab6887259 sha256=c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f -md5=903a924c21b63a610a641a651f38d72f -cksum=177777344 upstream_url=https://pypi.io/packages/py3/i/idna/idna-VERSION-py3-none-any.whl diff --git a/build/pkgs/igraph/checksums.ini b/build/pkgs/igraph/checksums.ini index 802e094f33b..6d63bbce214 100644 --- a/build/pkgs/igraph/checksums.ini +++ b/build/pkgs/igraph/checksums.ini @@ -1,6 +1,4 @@ tarball=igraph-VERSION.tar.gz sha1=40efbd2adf3c1cc0a2bb3e14f4c7898d053f1fe4 sha256=ac5fa94ae6fd1eace651e4b235e99c056479a5c5d0d641aed30240ac33b19403 -md5=87d287445c44fdd19ad67a25e0e0859b -cksum=2559618807 upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz diff --git a/build/pkgs/imagesize/checksums.ini b/build/pkgs/imagesize/checksums.ini index bd5cb019d59..75413be5c69 100644 --- a/build/pkgs/imagesize/checksums.ini +++ b/build/pkgs/imagesize/checksums.ini @@ -1,6 +1,4 @@ tarball=imagesize-VERSION-py2.py3-none-any.whl sha1=6054e528ed40a9979df9952437a20c3e5773d972 sha256=0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b -md5=020f792680bad3d268a7321947e4e542 -cksum=379545474 upstream_url=https://pypi.io/packages/py2.py3/i/imagesize/imagesize-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/iml/checksums.ini b/build/pkgs/iml/checksums.ini index 1c3a3355bb7..df0743f2ae6 100644 --- a/build/pkgs/iml/checksums.ini +++ b/build/pkgs/iml/checksums.ini @@ -1,5 +1,3 @@ tarball=iml-VERSION.tar.bz2 sha1=8aba468a62e6fb0584be9b014350b734663c0670 sha256=220161bbe4b54b24fcffc6c9117c8c8c09f2f13a9e2351cc2ef0dbac33bd418a -md5=a8083e70c0c4378f69eb772c1eeed6f0 -cksum=2793221462 diff --git a/build/pkgs/importlib_metadata/checksums.ini b/build/pkgs/importlib_metadata/checksums.ini index b4eebafdb45..d21661c6dbc 100644 --- a/build/pkgs/importlib_metadata/checksums.ini +++ b/build/pkgs/importlib_metadata/checksums.ini @@ -1,6 +1,4 @@ tarball=importlib_metadata-VERSION-py3-none-any.whl sha1=82c9e2e6cfbb2d5a14558085efa65e75a95bd12f sha256=4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e -md5=6e7b1ecc1d63501048d17b2a59e74878 -cksum=905912098 upstream_url=https://pypi.io/packages/py3/i/importlib_metadata/importlib_metadata-VERSION-py3-none-any.whl diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini index da77e46d8e8..c4025635c2f 100644 --- a/build/pkgs/importlib_resources/checksums.ini +++ b/build/pkgs/importlib_resources/checksums.ini @@ -1,6 +1,4 @@ tarball=importlib_resources-VERSION-py3-none-any.whl sha1=5caa4e8a9ee93123a5c3badb6edbc009b5d8494a sha256=e8bf90d8213b486f428c9c39714b920041cb02c184686a3dee24905aaa8105d6 -md5=a4ba26d808eed58bde249276da04c9e1 -cksum=2487282894 upstream_url=https://pypi.io/packages/py3/i/importlib_resources/importlib_resources-VERSION-py3-none-any.whl diff --git a/build/pkgs/info/checksums.ini b/build/pkgs/info/checksums.ini index 5aa961ad117..20442649954 100644 --- a/build/pkgs/info/checksums.ini +++ b/build/pkgs/info/checksums.ini @@ -1,6 +1,4 @@ tarball=texinfo-VERSION.tar.xz sha1=356a623b88401d7c993408f33450c8104aad9df8 sha256=74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf -md5=37bf94fd255729a14d4ea3dda119f81a -cksum=1448415744 upstream_url=https://ftp.gnu.org/gnu/texinfo/texinfo-VERSION.tar.xz diff --git a/build/pkgs/ipykernel/checksums.ini b/build/pkgs/ipykernel/checksums.ini index eaf86f10940..ccb54046f0a 100644 --- a/build/pkgs/ipykernel/checksums.ini +++ b/build/pkgs/ipykernel/checksums.ini @@ -1,6 +1,4 @@ tarball=ipykernel-VERSION.tar.gz sha1=3465b4aa523705e930f295b5c549924e376a02e2 sha256=7d5d594b6690654b4d299edba5e872dc17bb7396a8d0609c97cb7b8a1c605de6 -md5=f48666313b1ddf7b796b9a58805ba71b -cksum=2919090600 upstream_url=https://pypi.io/packages/source/i/ipykernel/ipykernel-VERSION.tar.gz diff --git a/build/pkgs/ipympl/checksums.ini b/build/pkgs/ipympl/checksums.ini index d3de7193dff..ec23f194f50 100644 --- a/build/pkgs/ipympl/checksums.ini +++ b/build/pkgs/ipympl/checksums.ini @@ -1,6 +1,4 @@ tarball=ipympl-VERSION-py2.py3-none-any.whl sha1=9848409026669d9edd83074730d7e2456ae8a187 sha256=d113cd55891bafe9b27ef99b6dd111a87beb6bb2ae550c404292272103be8013 -md5=e08ec29d29955174178b7230d41a7ff7 -cksum=490103438 upstream_url=https://pypi.io/packages/py2.py3/i/ipympl/ipympl-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/ipython/checksums.ini b/build/pkgs/ipython/checksums.ini index 1c9704c439b..0f7cc9c7d51 100644 --- a/build/pkgs/ipython/checksums.ini +++ b/build/pkgs/ipython/checksums.ini @@ -1,6 +1,4 @@ tarball=ipython-VERSION.tar.gz sha1=4b5ab06a1b5e1a3285ac91d7dac9a22d18898a31 sha256=ca6f079bb33457c66e233e4580ebfc4128855b4cf6370dddd73842a9563e8a27 -md5=b56b71635168357dc94ac384b0a78f0c -cksum=1043636334 upstream_url=https://pypi.io/packages/source/i/ipython/ipython-VERSION.tar.gz diff --git a/build/pkgs/ipython_genutils/checksums.ini b/build/pkgs/ipython_genutils/checksums.ini index c0ed181da0f..64e87d3d967 100644 --- a/build/pkgs/ipython_genutils/checksums.ini +++ b/build/pkgs/ipython_genutils/checksums.ini @@ -1,5 +1,3 @@ tarball=ipython_genutils-VERSION.tar.gz sha1=5bbf262704d1406ed63e639c5136bf80b87272c5 sha256=eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 -md5=5a4f9781f78466da0ea1a648f3e1f79f -cksum=2736651136 diff --git a/build/pkgs/ipywidgets/checksums.ini b/build/pkgs/ipywidgets/checksums.ini index 773389a7c14..ad3dca0b6d8 100644 --- a/build/pkgs/ipywidgets/checksums.ini +++ b/build/pkgs/ipywidgets/checksums.ini @@ -1,6 +1,4 @@ tarball=ipywidgets-VERSION.tar.gz sha1=95f7ec13e8ce75e2da40c1789b4af291946a6d99 sha256=40211efb556adec6fa450ccc2a77d59ca44a060f4f9f136833df59c9f538e6e8 -md5=2809d1668037606caac588cab329bece -cksum=1839869422 upstream_url=https://pypi.io/packages/source/i/ipywidgets/ipywidgets-VERSION.tar.gz diff --git a/build/pkgs/isl/checksums.ini b/build/pkgs/isl/checksums.ini index 9997d236887..8017dc5cc24 100644 --- a/build/pkgs/isl/checksums.ini +++ b/build/pkgs/isl/checksums.ini @@ -1,5 +1,3 @@ tarball=isl-VERSION.tar.bz2 sha1=b1d96b7b44c72f86c98d4fbd4caaa7796b27681e sha256=b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2 -md5=cb396f31b24aeeac49840b519741b0e1 -cksum=4190462468 diff --git a/build/pkgs/isoduration/checksums.ini b/build/pkgs/isoduration/checksums.ini index e1c3cc0e720..d3e080d1982 100644 --- a/build/pkgs/isoduration/checksums.ini +++ b/build/pkgs/isoduration/checksums.ini @@ -1,6 +1,4 @@ tarball=isoduration-VERSION-py3-none-any.whl sha1=a113878d368fee6881efcfd12421b12f8e6ae11c sha256=b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042 -md5=c5f76c264bf80cca84b99c48d8af5afb -cksum=3373220361 upstream_url=https://pypi.io/packages/py3/i/isoduration/isoduration-VERSION-py3-none-any.whl diff --git a/build/pkgs/jedi/checksums.ini b/build/pkgs/jedi/checksums.ini index 4966025cd53..bbfe9535f75 100644 --- a/build/pkgs/jedi/checksums.ini +++ b/build/pkgs/jedi/checksums.ini @@ -1,6 +1,4 @@ tarball=jedi-VERSION.tar.gz sha1=07d1e04c24cecf1b7f38f8905ce81c006f76cc20 sha256=cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd -md5=0951191b506b660bfdb90c3dcd5b3254 -cksum=8256815 upstream_url=https://pypi.io/packages/source/j/jedi/jedi-VERSION.tar.gz diff --git a/build/pkgs/jinja2/checksums.ini b/build/pkgs/jinja2/checksums.ini index 79fd7d26134..fa9f5daf853 100644 --- a/build/pkgs/jinja2/checksums.ini +++ b/build/pkgs/jinja2/checksums.ini @@ -1,6 +1,4 @@ tarball=Jinja2-VERSION-py3-none-any.whl sha1=2a4d66fe16c565145c8bec1b22d57ab1e7028613 sha256=7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa -md5=bb730eed73dcd0bc2b04c71555f37d92 -cksum=1024075345 upstream_url=https://pypi.io/packages/py3/j/jinja2/Jinja2-VERSION-py3-none-any.whl diff --git a/build/pkgs/jmol/checksums.ini b/build/pkgs/jmol/checksums.ini index 09c0eae12a7..fed8afec819 100644 --- a/build/pkgs/jmol/checksums.ini +++ b/build/pkgs/jmol/checksums.ini @@ -1,5 +1,3 @@ tarball=jmol-VERSION.tar.bz2 sha1=63aa528c1105733b1ad2cde222cf8c7ba7f456c4 sha256=ebf9cd42cd8e3839cf94ec11691b98a9b00917f3485a821291b76d7ecd6ffe9d -md5=99974970fe3c78e4401bf62780185fee -cksum=3961597437 diff --git a/build/pkgs/json5/checksums.ini b/build/pkgs/json5/checksums.ini index 1a693c48287..d95e497ddc7 100644 --- a/build/pkgs/json5/checksums.ini +++ b/build/pkgs/json5/checksums.ini @@ -1,6 +1,4 @@ tarball=json5-VERSION-py2.py3-none-any.whl sha1=54bf91b9c2812e82ccd212cefca5bc5607a538b4 sha256=740c7f1b9e584a468dbb2939d8d458db3427f2c93ae2139d05f47e453eae964f -md5=aede9af2a42cc0cd928e4dc99e9a6a45 -cksum=134804175 upstream_url=https://pypi.io/packages/py2.py3/j/json5/json5-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jsonpointer/checksums.ini b/build/pkgs/jsonpointer/checksums.ini index 1294f43332f..df24503fc54 100644 --- a/build/pkgs/jsonpointer/checksums.ini +++ b/build/pkgs/jsonpointer/checksums.ini @@ -1,6 +1,4 @@ tarball=jsonpointer-VERSION-py2.py3-none-any.whl sha1=de1b07c2d014f5b8e672cf0fb1225b2232d0b414 sha256=15d51bba20eea3165644553647711d150376234112651b4f1811022aecad7d7a -md5=eb9dcb8c4ccf5d97cea88a7d13510032 -cksum=1224177904 upstream_url=https://pypi.io/packages/py2.py3/j/jsonpointer/jsonpointer-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jsonschema/checksums.ini b/build/pkgs/jsonschema/checksums.ini index f272e17e5e8..89a23a0d2cf 100644 --- a/build/pkgs/jsonschema/checksums.ini +++ b/build/pkgs/jsonschema/checksums.ini @@ -1,6 +1,4 @@ tarball=jsonschema-VERSION.tar.gz sha1=9f762c6c2b92defddf1c441cce8132d021252b2c sha256=0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d -md5=7c65ceb8923c83cb1f22c2b5a86d99b0 -cksum=2329321415 upstream_url=https://pypi.io/packages/source/j/jsonschema/jsonschema-VERSION.tar.gz diff --git a/build/pkgs/jsonschema_specifications/checksums.ini b/build/pkgs/jsonschema_specifications/checksums.ini index bf3eff7dcca..df5d6944abd 100644 --- a/build/pkgs/jsonschema_specifications/checksums.ini +++ b/build/pkgs/jsonschema_specifications/checksums.ini @@ -1,6 +1,4 @@ tarball=jsonschema_specifications-VERSION-py3-none-any.whl sha1=4132bed31478bc96960099e58ae4c083c514c551 sha256=764a2b9325c225208121948b15f2b2d16fddbe223fdfc096b45c70c1f7f7b8c1 -md5=dbd17550f666e0f9aa74270d0d4e97a3 -cksum=135654159 upstream_url=https://pypi.io/packages/py3/j/jsonschema_specifications/jsonschema_specifications-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupymake/checksums.ini b/build/pkgs/jupymake/checksums.ini index b6c2e9bc6dc..cc9c4dcaea7 100644 --- a/build/pkgs/jupymake/checksums.ini +++ b/build/pkgs/jupymake/checksums.ini @@ -1,5 +1,3 @@ tarball=JuPyMake-VERSION.tar.gz sha1=0dc4e4a29afbdc733908249cd28b7ed4c4ab8b73 sha256=4c756cd6a6056a20cd71f7b5e463c79dad0257241bbd32a40b750882fafdb545 -md5=646f0c6c91166ea84e233587fc2dec1e -cksum=4049738923 diff --git a/build/pkgs/jupyter_client/checksums.ini b/build/pkgs/jupyter_client/checksums.ini index 74fc516ac89..af7a000f71d 100644 --- a/build/pkgs/jupyter_client/checksums.ini +++ b/build/pkgs/jupyter_client/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_client-VERSION-py3-none-any.whl sha1=341f822626b55b53f03a21a44d78dc203472406b sha256=5eb9f55eb0650e81de6b7e34308d8b92d04fe4ec41cd8193a913979e33d8e1a5 -md5=cca418dacc69d69f3e3c71704f1fd259 -cksum=753481733 upstream_url=https://pypi.io/packages/py3/j/jupyter_client/jupyter_client-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_core/checksums.ini b/build/pkgs/jupyter_core/checksums.ini index e0ae751e99d..672c7f93bcc 100644 --- a/build/pkgs/jupyter_core/checksums.ini +++ b/build/pkgs/jupyter_core/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_core-VERSION.tar.gz sha1=0fe33e3247e595cdb83e2220f02c566ea9397e6a sha256=0c28db6cbe2c37b5b398e1a1a5b22f84fd64cd10afc1f6c05b02fb09481ba45f -md5=1d61b3c16f6781d8f44e1bd95cd8e73f -cksum=523684111 upstream_url=https://pypi.io/packages/source/j/jupyter_core/jupyter_core-VERSION.tar.gz diff --git a/build/pkgs/jupyter_events/checksums.ini b/build/pkgs/jupyter_events/checksums.ini index 6ca8548cffb..d7fc20e35ba 100644 --- a/build/pkgs/jupyter_events/checksums.ini +++ b/build/pkgs/jupyter_events/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_events-VERSION-py3-none-any.whl sha1=1b3fd8c003ea9e51b0f2d38daa89fded161767f7 sha256=57a2749f87ba387cd1bfd9b22a0875b889237dbf2edc2121ebb22bde47036c17 -md5=c29e5cb7f9f1b3916b2d9d416b470294 -cksum=2851951719 upstream_url=https://pypi.io/packages/py3/j/jupyter_events/jupyter_events-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_jsmol/checksums.ini b/build/pkgs/jupyter_jsmol/checksums.ini index b27ffb72b5f..533f2b689d3 100644 --- a/build/pkgs/jupyter_jsmol/checksums.ini +++ b/build/pkgs/jupyter_jsmol/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_jsmol-VERSION-py2.py3-none-any.whl sha1=b00f1ca76aaa906c7c0a43e36baf608183f3d552 sha256=dca3a232f98aa92739de8b7905765d22f325a2ba5d7a3a2f5b2374e88cc80471 -md5=dd786877513296a36a08518ad64ace47 -cksum=2135042898 upstream_url=https://pypi.io/packages/py2.py3/j/jupyter_jsmol/jupyter_jsmol-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jupyter_lsp/checksums.ini b/build/pkgs/jupyter_lsp/checksums.ini index 9d4fd961cb1..b925e4da051 100644 --- a/build/pkgs/jupyter_lsp/checksums.ini +++ b/build/pkgs/jupyter_lsp/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_lsp-VERSION-py3-none-any.whl sha1=0f7a63d99c5cf624315583099f00eafc4b996b59 sha256=9e06b8b4f7dd50300b70dd1a78c0c3b0c3d8fa68e0f2d8a5d1fbab62072aca3f -md5=9c17daaa4372bffca936c1b6977e713b -cksum=1933820697 upstream_url=https://pypi.io/packages/py3/j/jupyter_lsp/jupyter_lsp-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_server/checksums.ini b/build/pkgs/jupyter_server/checksums.ini index a3e7a1d5ba3..9519eaa2ae6 100644 --- a/build/pkgs/jupyter_server/checksums.ini +++ b/build/pkgs/jupyter_server/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_server-VERSION-py3-none-any.whl sha1=a54aa7f6f1657a55cae9ecc4a6654b6e3ca5fb73 sha256=8e4b90380b59d7a1e31086c4692231f2a2ea4cb269f5516e60aba72ce8317fc9 -md5=b028711b35fa80f6c7b01a54bd70718a -cksum=1159424906 upstream_url=https://pypi.io/packages/py3/j/jupyter_server/jupyter_server-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyter_server_terminals/checksums.ini b/build/pkgs/jupyter_server_terminals/checksums.ini index 427453a63ad..be5ba3efe9b 100644 --- a/build/pkgs/jupyter_server_terminals/checksums.ini +++ b/build/pkgs/jupyter_server_terminals/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyter_server_terminals-VERSION-py3-none-any.whl sha1=fd1201e9f0064b2a5a05ed7346dfe52546f13b0b sha256=75779164661cec02a8758a5311e18bb8eb70c4e86c6b699403100f1585a12a36 -md5=6312ef2342aa944aaa59619249d7248b -cksum=2312769383 upstream_url=https://pypi.io/packages/py3/j/jupyter_server_terminals/jupyter_server_terminals-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab/checksums.ini b/build/pkgs/jupyterlab/checksums.ini index 1c40f9b678b..eea8e9d4191 100644 --- a/build/pkgs/jupyterlab/checksums.ini +++ b/build/pkgs/jupyterlab/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyterlab-VERSION-py3-none-any.whl sha1=4efdd879660e719fd49be6ec169272f32a16593e sha256=67dbec7057c6ad46f08a3667a80bdb890df9453822c93b5ddfd5e8313a718ef9 -md5=968a2b0458440a6b018ff2863a66e4af -cksum=2309499829 upstream_url=https://pypi.io/packages/py3/j/jupyterlab/jupyterlab-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_mathjax2/checksums.ini b/build/pkgs/jupyterlab_mathjax2/checksums.ini index cc4722ddd28..3ff851f18bb 100644 --- a/build/pkgs/jupyterlab_mathjax2/checksums.ini +++ b/build/pkgs/jupyterlab_mathjax2/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyterlab_mathjax2-VERSION-py3-none-any.whl sha1=4e2bb182594a6c4f5d4edfb4f6e33597f09de402 sha256=c65c401ee5638e7cbf1223ba95aceed8b26a2a3e48fd1d585a10dd95b9327a8f -md5=4172e36b068af6a3f36c26a3f1946dc9 -cksum=387386440 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_mathjax2/jupyterlab_mathjax2-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_pygments/checksums.ini b/build/pkgs/jupyterlab_pygments/checksums.ini index 3a1f7c5a7d0..7cbeda65aab 100644 --- a/build/pkgs/jupyterlab_pygments/checksums.ini +++ b/build/pkgs/jupyterlab_pygments/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyterlab_pygments-VERSION-py2.py3-none-any.whl sha1=601f547767fa867494ff0764891807904b8ebbd2 sha256=2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f -md5=44194b8e643cf025ec3a91f0c751c7d7 -cksum=4169885263 upstream_url=https://pypi.io/packages/py2.py3/j/jupyterlab_pygments/jupyterlab_pygments-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/jupyterlab_server/checksums.ini b/build/pkgs/jupyterlab_server/checksums.ini index f7d600275bc..84eeb7a8b8d 100644 --- a/build/pkgs/jupyterlab_server/checksums.ini +++ b/build/pkgs/jupyterlab_server/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyterlab_server-VERSION-py3-none-any.whl sha1=1fff8c8bc4c81b006cb83d4524dc8a6f3364e57c sha256=5f077e142bb8dc9b843d960f940c513581bceca3793a0d80f9c67d9522c4e876 -md5=795bbf343ae17b75a31a50ef574d4b77 -cksum=696988100 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_server/jupyterlab_server-VERSION-py3-none-any.whl diff --git a/build/pkgs/jupyterlab_widgets/checksums.ini b/build/pkgs/jupyterlab_widgets/checksums.ini index 820b0ce5c07..f7a3c9bbeb8 100644 --- a/build/pkgs/jupyterlab_widgets/checksums.ini +++ b/build/pkgs/jupyterlab_widgets/checksums.ini @@ -1,6 +1,4 @@ tarball=jupyterlab_widgets-VERSION-py3-none-any.whl sha1=b10775bb3966af627bb44fbda4efb553b24a5b93 sha256=3cf5bdf5b897bf3bccf1c11873aa4afd776d7430200f765e0686bd352487b58d -md5=fc3c9f41000461dbdca2b965fcee37db -cksum=441194289 upstream_url=https://pypi.io/packages/py3/j/jupyterlab_widgets/jupyterlab_widgets-VERSION-py3-none-any.whl diff --git a/build/pkgs/kenzo/checksums.ini b/build/pkgs/kenzo/checksums.ini index 17974d1eb58..882ad8e2c97 100644 --- a/build/pkgs/kenzo/checksums.ini +++ b/build/pkgs/kenzo/checksums.ini @@ -1,6 +1,4 @@ tarball=kenzo-VERSION.tar.gz sha1=76115aae9972090d5d51fee18592fc7a79461474 sha256=2a23697611a37714433a9e273098d0b2dfe4fdcd83d98b9fc8d7a055c064ed6b -md5=3a3d5350fb17304f03e614713e585ed4 -cksum=2981306888 upstream_url=https://github.com/miguelmarco/kenzo/releases/download/VERSION/kenzo-VERSION.tar.gz diff --git a/build/pkgs/kissat/checksums.ini b/build/pkgs/kissat/checksums.ini index 58b7a9e9987..c929e1733e1 100644 --- a/build/pkgs/kissat/checksums.ini +++ b/build/pkgs/kissat/checksums.ini @@ -1,6 +1,4 @@ tarball=kissat-rel-VERSION.tar.gz sha1=49972324939761306ee50cfa3df93cd3cd530256 sha256=e85c757179bf7d96d21d2d6e3f0a8f2337d416b0e13ae065a9a8d52e30048bd3 -md5=1d0fa246c5451e3592910f2c9a5f3476 -cksum=2570717921 upstream_url=https://github.com/arminbiere/kissat/archive/refs/tags/rel-VERSION.tar.gz diff --git a/build/pkgs/kiwisolver/checksums.ini b/build/pkgs/kiwisolver/checksums.ini index 4e6dc7652ad..84fc1beba83 100644 --- a/build/pkgs/kiwisolver/checksums.ini +++ b/build/pkgs/kiwisolver/checksums.ini @@ -1,6 +1,4 @@ tarball=kiwisolver-VERSION.tar.gz sha1=e5234bdcb7e7b620d47a00da076d50f2b63d8649 sha256=e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec -md5=20dea6992699d6be8a563995d7fe0309 -cksum=1731645516 upstream_url=https://files.pythonhosted.org/packages/source/k/kiwisolver/kiwisolver-VERSION.tar.gz diff --git a/build/pkgs/latte_int/checksums.ini b/build/pkgs/latte_int/checksums.ini index d3922160f2e..8b73fd1e4f2 100644 --- a/build/pkgs/latte_int/checksums.ini +++ b/build/pkgs/latte_int/checksums.ini @@ -1,6 +1,4 @@ tarball=latte-int-VERSION.tar.gz sha1=0ba017349b21a9fdb34b74d7e23d584aa562b8f7 sha256=006c10ebe5d5bfdc9b159cba6264a4432861fe763ce05fe821624ab7d3fc2170 -md5=aa062777c4879f566134d048ce4c87d6 -cksum=3733141299 upstream_url=https://github.com/latte-int/latte/releases/download/version_1_7_6/latte-int-VERSION.tar.gz diff --git a/build/pkgs/lcalc/checksums.ini b/build/pkgs/lcalc/checksums.ini index f3da39a147c..b56cf1b79bf 100644 --- a/build/pkgs/lcalc/checksums.ini +++ b/build/pkgs/lcalc/checksums.ini @@ -1,6 +1,4 @@ tarball=lcalc-VERSION.tar.xz sha1=dacf9ab672136edc2af5fe9adb7b0ced1e63eeff sha256=d780c385579cc6ee45fa27ccd2d3a3c4157fbb5ef8cd1b8951d1028bbc64c035 -md5=c496e95ae07a58085e93b2b3c3348719 -cksum=1694786 upstream_url=https://gitlab.com/sagemath/lcalc/uploads/25f029f3c02fcb6c3174972e0ac0e192/lcalc-VERSION.tar.xz diff --git a/build/pkgs/libatomic_ops/checksums.ini b/build/pkgs/libatomic_ops/checksums.ini index f38b430a77c..bd2b5075221 100644 --- a/build/pkgs/libatomic_ops/checksums.ini +++ b/build/pkgs/libatomic_ops/checksums.ini @@ -1,6 +1,4 @@ tarball=libatomic_ops-VERSION.tar.gz sha1=69223bbec025a0d57977feb861479f78a5e6c8d7 sha256=15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31 -md5=a7e51e8041c3e60c298c037b2789c3fa -cksum=596151076 upstream_url=https://github.com/ivmai/libatomic_ops/releases/download/vVERSION/libatomic_ops-VERSION.tar.gz diff --git a/build/pkgs/libbraiding/checksums.ini b/build/pkgs/libbraiding/checksums.ini index 15d87cbf265..5a956e027bf 100644 --- a/build/pkgs/libbraiding/checksums.ini +++ b/build/pkgs/libbraiding/checksums.ini @@ -1,6 +1,4 @@ tarball=libbraiding-VERSION-actually-VERSION.tar.gz sha1=b7e13778784fe1e36e7c0cbd7a4c234a090cd1b2 sha256=73087d1145ace719eafeda1db1c28b5fe1c981b7e784dc59f2b1d6fc4ff75f80 -md5=0513967c81b783ea66336b7ad0562534 -cksum=3619705925 upstream_url=https://github.com/miguelmarco/libbraiding/releases/download/VERSION/libbraiding-VERSION.tar.gz diff --git a/build/pkgs/libffi/checksums.ini b/build/pkgs/libffi/checksums.ini index 3747afcbad8..327da6eed8b 100644 --- a/build/pkgs/libffi/checksums.ini +++ b/build/pkgs/libffi/checksums.ini @@ -1,5 +1,3 @@ tarball=libffi-VERSION.tar.gz sha1=280c265b789e041c02e5c97815793dfc283fb1e6 sha256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 -md5=83b89587607e3eb65c70d361f13bab43 -cksum=691100768 diff --git a/build/pkgs/libgd/checksums.ini b/build/pkgs/libgd/checksums.ini index 3a9bfaec6ea..128e99830cf 100644 --- a/build/pkgs/libgd/checksums.ini +++ b/build/pkgs/libgd/checksums.ini @@ -1,6 +1,4 @@ tarball=libgd-VERSION.tar.xz sha1=7ce6ecb5aed26c08246a37b6351c886ab4b51ca2 sha256=3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61 -md5=7a58b54d375eda236414201252a0ee3c -cksum=1360697583 upstream_url=https://github.com/libgd/libgd/releases/download/gd-VERSION/libgd-VERSION.tar.xz diff --git a/build/pkgs/libhomfly/checksums.ini b/build/pkgs/libhomfly/checksums.ini index da1bcf4582c..e763424cc34 100644 --- a/build/pkgs/libhomfly/checksums.ini +++ b/build/pkgs/libhomfly/checksums.ini @@ -1,6 +1,4 @@ tarball=libhomfly-VERSION.tar.gz sha1=a8a4d9fb5bfacdbacab32bb0c8ea6d21ad9f7e54 sha256=f990d991d29a590c54b09eff68bc209c4cf2b8b12d945351688d2db8a0d30979 -md5=1bb639fd4182be7ac9dbec0c3e631ce2 -cksum=920200221 upstream_url=https://github.com/miguelmarco/libhomfly/releases/download/VERSION/libhomfly-VERSION.tar.gz diff --git a/build/pkgs/libogg/checksums.ini b/build/pkgs/libogg/checksums.ini index 10ad75791b1..b82853fc105 100644 --- a/build/pkgs/libogg/checksums.ini +++ b/build/pkgs/libogg/checksums.ini @@ -1,5 +1,3 @@ tarball=libogg-VERSION.tar.gz sha1=270685c2a3d9dc6c98372627af99868aa4b4db53 sha256=4e343f07aa5a1de8e0fa1107042d472186b3470d846b20b115b964eba5bae554 -md5=ba526cd8f4403a5d351a9efaa8608fbc -cksum=1193714825 diff --git a/build/pkgs/libpng/checksums.ini b/build/pkgs/libpng/checksums.ini index 239950867a1..3ff528ccdc6 100644 --- a/build/pkgs/libpng/checksums.ini +++ b/build/pkgs/libpng/checksums.ini @@ -1,5 +1,3 @@ tarball=libpng-VERSION.tar.gz sha1=012c842e6454dc38c6390623ed31ec4005c00584 sha256=e30bf36cd5882e017c23a5c6a79a9aa1a744dd5841bb45ff7035ec6e3b3096b8 -md5=68553080685f812d1dd7a6b8215c37d8 -cksum=1294784956 diff --git a/build/pkgs/libsemigroups/checksums.ini b/build/pkgs/libsemigroups/checksums.ini index 7d367b23559..e258d4f2058 100644 --- a/build/pkgs/libsemigroups/checksums.ini +++ b/build/pkgs/libsemigroups/checksums.ini @@ -1,6 +1,4 @@ tarball=libsemigroups-VERSION.tar.gz sha1=86375824b47ce4b0e23570122e873f67136d0c0a sha256=6214fd9e87af3834ff5eb6377cde1cbef76c74b233e1b0c4d15af1d2311692b4 -md5=ff79ad5fbc8bfeb64d48faaf24106b98 -cksum=2845045455 upstream_url=https://github.com/libsemigroups/libsemigroups/releases/download/vVERSION/libsemigroups-VERSION.tar.gz diff --git a/build/pkgs/libtheora/checksums.ini b/build/pkgs/libtheora/checksums.ini index 53a8d68ad6a..b940bb462c1 100644 --- a/build/pkgs/libtheora/checksums.ini +++ b/build/pkgs/libtheora/checksums.ini @@ -1,5 +1,3 @@ tarball=libtheora-VERSION.tar.bz2 sha1=8dcaa8e61cd86eb1244467c0b64b9ddac04ae262 sha256=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc -md5=292ab65cedd5021d6b7ddd117e07cd8e -cksum=480505883 diff --git a/build/pkgs/lidia/checksums.ini b/build/pkgs/lidia/checksums.ini index c33d08f5fa9..29d6de29c90 100644 --- a/build/pkgs/lidia/checksums.ini +++ b/build/pkgs/lidia/checksums.ini @@ -1,5 +1,3 @@ tarball=lidia-VERSION.tar.gz sha1=93da2f24e3caa4c10452b4f088382084da3ddfbd sha256=a5a07e65fc48c9230e9669e4d968b4ede2cac234a49d0c8c93b85040d0d79c41 -md5=2d75b417194e98be64dd85368e149cf4 -cksum=1175913571 diff --git a/build/pkgs/lie/checksums.ini b/build/pkgs/lie/checksums.ini index 5cf792516a5..312aa3cbe54 100644 --- a/build/pkgs/lie/checksums.ini +++ b/build/pkgs/lie/checksums.ini @@ -1,5 +1,3 @@ tarball=lie-VERSION.tar.gz sha1=bf8d2303c02738cfd2c899332d736b5364322a5d sha256=c4d6f67fa17d2bc77c875a5b2ad2b42ffc5cadf30e7d1c64c097648ccb918b1e -md5=2e98f252364d43557a322ea7eb677944 -cksum=3838739617 diff --git a/build/pkgs/linbox/checksums.ini b/build/pkgs/linbox/checksums.ini index 38208010e47..43b3c64d61e 100644 --- a/build/pkgs/linbox/checksums.ini +++ b/build/pkgs/linbox/checksums.ini @@ -1,5 +1,3 @@ tarball=linbox-VERSION.tar.gz sha1=9268e21b5aecbbfc45204b25195b786f80b769bc sha256=a58a188307b07c57964e844bceb99321d3043a8a4a1fccc082a54928bb9a0057 -md5=1e90e300c7a324a7b6cece7c605b7a4e -cksum=1921179523 diff --git a/build/pkgs/lrcalc/checksums.ini b/build/pkgs/lrcalc/checksums.ini index 6b9bef02f33..dc42cc9271a 100644 --- a/build/pkgs/lrcalc/checksums.ini +++ b/build/pkgs/lrcalc/checksums.ini @@ -1,6 +1,4 @@ tarball=liblrcalc-VERSION.tar.gz sha1=2a98661eb39c7ef526c932f7886fc3142fd639ab sha256=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57 -md5=7cfa8f67287f2b70a15a833b94bc24b6 -cksum=2250996027 upstream_url=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-VERSION.tar.gz diff --git a/build/pkgs/lrcalc_python/checksums.ini b/build/pkgs/lrcalc_python/checksums.ini index 91302f16f6d..99e136d82bb 100644 --- a/build/pkgs/lrcalc_python/checksums.ini +++ b/build/pkgs/lrcalc_python/checksums.ini @@ -1,6 +1,4 @@ tarball=lrcalc-VERSION.tar.gz sha1=3e9366d9e8b8beccec70b07d174b8f6683c01574 sha256=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9 -md5=4ae444d12ed8e0dd770594ea3ef4a208 -cksum=2741305196 upstream_url=https://pypi.io/packages/source/l/lrcalc/lrcalc-VERSION.tar.gz diff --git a/build/pkgs/lrslib/checksums.ini b/build/pkgs/lrslib/checksums.ini index 14b58331d5a..0874680c33b 100644 --- a/build/pkgs/lrslib/checksums.ini +++ b/build/pkgs/lrslib/checksums.ini @@ -1,6 +1,4 @@ tarball=lrslib-VERSION.tar.gz sha1=4723f2b96e4b59d8366316b84214d6221b7ee7ce sha256=a202f3fb24a2e8561786dff679c7603c04c66d24728ad8aaba0b40dbdf9fb6a8 -md5=b379d2bdef0f5200c6274d9c50361b7c -cksum=1216904185 upstream_url=https://github.com/mkoeppe/lrslib/releases/download/lrslib-VERSION/lrslib-VERSION.tar.gz diff --git a/build/pkgs/m4ri/checksums.ini b/build/pkgs/m4ri/checksums.ini index 0961df29ae4..0deac09bc50 100644 --- a/build/pkgs/m4ri/checksums.ini +++ b/build/pkgs/m4ri/checksums.ini @@ -1,5 +1,3 @@ tarball=m4ri-VERSION.tar.gz sha1=7d0d680f1e983c1d5b24e49f25194e2f327690b4 sha256=a2ba0d74ec5129c6fab59cd7d8e7a9f00a69ec63b76672105faef524f9d88556 -md5=3fb6a27437bf535128d605fe47c8fae8 -cksum=1002661464 diff --git a/build/pkgs/m4rie/checksums.ini b/build/pkgs/m4rie/checksums.ini index b2f56262594..096641cd512 100644 --- a/build/pkgs/m4rie/checksums.ini +++ b/build/pkgs/m4rie/checksums.ini @@ -1,5 +1,3 @@ tarball=m4rie-VERSION.tar.gz sha1=728524509dd30da2dc960814b61d0bae67f83043 sha256=aea462e8c9b4c0303c0a064bd7ead52fe81214e59a7fc694f350161cad4f2c85 -md5=e7685c63e7bab4c5a0922a161499ba83 -cksum=127676695 diff --git a/build/pkgs/markupsafe/checksums.ini b/build/pkgs/markupsafe/checksums.ini index 7e69552212f..53502ada131 100644 --- a/build/pkgs/markupsafe/checksums.ini +++ b/build/pkgs/markupsafe/checksums.ini @@ -1,6 +1,4 @@ tarball=MarkupSafe-VERSION.tar.gz sha1=ffca1ac960cedaf0cb419b5c97b64aab12220d04 sha256=3aae9af4cac263007fd6309c64c6ab4506dd2b79382d9d19a1994f9240b8db4f -md5=8138329a11cf4bd0f9db780b2af26c66 -cksum=379626437 upstream_url=https://pypi.io/packages/source/m/markupsafe/MarkupSafe-VERSION.tar.gz diff --git a/build/pkgs/mathics/checksums.ini b/build/pkgs/mathics/checksums.ini index 86972d7ccd7..d43327d515d 100644 --- a/build/pkgs/mathics/checksums.ini +++ b/build/pkgs/mathics/checksums.ini @@ -1,6 +1,4 @@ tarball=Mathics3-VERSION.tar.gz sha1=a72550d3df97dd4055cf903a9f012683ca2adf35 sha256=d50ee5ad07db845609078c99af789253337a45f50bef6f8b09262f48dca8da7c -md5=f221aaf0ef9a27e2953429a32fe94652 -cksum=658740029 upstream_url=https://pypi.io/packages/source/M/Mathics3/Mathics3-VERSION.tar.gz diff --git a/build/pkgs/mathics_scanner/checksums.ini b/build/pkgs/mathics_scanner/checksums.ini index bc47ea48118..9d04979b6bd 100644 --- a/build/pkgs/mathics_scanner/checksums.ini +++ b/build/pkgs/mathics_scanner/checksums.ini @@ -1,6 +1,4 @@ tarball=Mathics_Scanner-VERSION.tar.gz sha1=c89bb997c1da04c1cfe945d16be96bdb0c6ae9a8 sha256=7b05939751aacea42f3fc4e7eb1ab111f9fe32bae827e89f46a50e04907b19ef -md5=5c1aabb415729617d8ebe03470f92339 -cksum=1258714825 upstream_url=https://pypi.io/packages/source/m/mathics_scanner/Mathics_Scanner-VERSION.tar.gz diff --git a/build/pkgs/mathjax/checksums.ini b/build/pkgs/mathjax/checksums.ini index 24d5ac573d2..9be83c3fee4 100644 --- a/build/pkgs/mathjax/checksums.ini +++ b/build/pkgs/mathjax/checksums.ini @@ -1,5 +1,3 @@ tarball=mathjax-VERSION.tar.gz sha1=3f7abecf8cacd7f5d7f9ae6c3baca7739101c17d sha256=9b2ed180ff2ddb8d4ea1d00e4d14791320c35496f57073514a129c0c67f7625b -md5=ba1a65ab58aaad6c84f39735c619bc34 -cksum=1142131398 diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index b00100ba3a2..317be590bcf 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,6 +1,4 @@ tarball=matplotlib-VERSION.tar.gz sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c sha256=df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69 -md5=2c70bea4dea84c090a7ecc8e0bb0748f -cksum=1228885956 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz diff --git a/build/pkgs/matplotlib_inline/checksums.ini b/build/pkgs/matplotlib_inline/checksums.ini index 66307fea992..294cf1a777a 100644 --- a/build/pkgs/matplotlib_inline/checksums.ini +++ b/build/pkgs/matplotlib_inline/checksums.ini @@ -1,6 +1,4 @@ tarball=matplotlib-inline-VERSION.tar.gz sha1=a09347e3f2eaa6f9453c773132bf4bd9d38e2163 sha256=f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304 -md5=aded9a57e2f526f76b3a4851d5528d4f -cksum=3152771377 upstream_url=https://pypi.io/packages/source/m/matplotlib_inline/matplotlib-inline-VERSION.tar.gz diff --git a/build/pkgs/matroid_database/checksums.ini b/build/pkgs/matroid_database/checksums.ini index 1de2b8288ba..39761ab122f 100644 --- a/build/pkgs/matroid_database/checksums.ini +++ b/build/pkgs/matroid_database/checksums.ini @@ -1,6 +1,4 @@ tarball=matroid_database-VERSION-py3-none-any.whl sha1=5879d6ca685f27df69134f56c07af50f9a2e6622 sha256=c82e58ee8fec8d94263b981c4397bb0df8f489cdfbd37b399ea5a01b9c12c099 -md5=e5d667282b7926a2fd268d14f9414214 -cksum=1875993705 upstream_url=https://pypi.io/packages/py3/m/matroid_database/matroid_database-VERSION-py3-none-any.whl diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini index 71fd8be84aa..164be5ccf3f 100644 --- a/build/pkgs/maxima/checksums.ini +++ b/build/pkgs/maxima/checksums.ini @@ -1,6 +1,4 @@ tarball=maxima-VERSION.tar.gz sha1=1010594e6d6082bbd8efaac1b7756ec1721a4ed5 sha256=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07 -md5=3c01f1daa6936e11d8713fef7751d3fe -cksum=2420393096 upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download diff --git a/build/pkgs/mcqd/checksums.ini b/build/pkgs/mcqd/checksums.ini index a0dae947db5..aa8ec3fce16 100644 --- a/build/pkgs/mcqd/checksums.ini +++ b/build/pkgs/mcqd/checksums.ini @@ -1,5 +1,3 @@ tarball=mcqd-VERSION.tar.bz2 sha1=9c55da46815aa3903f0be2d1ffbdff9c17d4aa31 sha256=54d378f51833f046bbceba2186d52c08026a295d0dfb74d2319e0ec7e3618f58 -md5=831538634b7b7efe15b5e5ad3d9c59c2 -cksum=2853560422 diff --git a/build/pkgs/meataxe/checksums.ini b/build/pkgs/meataxe/checksums.ini index 3caed4195c2..66d345805f4 100644 --- a/build/pkgs/meataxe/checksums.ini +++ b/build/pkgs/meataxe/checksums.ini @@ -1,6 +1,4 @@ tarball=shared_meataxe-VERSION.tar.bz2 sha1=6764f72fab8b4472660cff6605087356ab91d3b7 sha256=b8c5ff558712b266eef76a4ebc7a06e98cdef04cc46c542a1a725e318365969d -md5=c9af9efa686e120612455778d64a71ca -cksum=1648865875 upstream_url=https://github.com/simon-king-jena/SharedMeatAxe/releases/download/vVERSION/shared_meataxe-VERSION.tar.bz2 diff --git a/build/pkgs/meson/checksums.ini b/build/pkgs/meson/checksums.ini index 0cc13d09d55..00cf028db1e 100644 --- a/build/pkgs/meson/checksums.ini +++ b/build/pkgs/meson/checksums.ini @@ -1,6 +1,4 @@ tarball=meson-VERSION-py3-none-any.whl sha1=baf5b9bc9ca97f18c7dc87cfaf0e1dc4d617a4cf sha256=d5223ecca9564d735d36daaba2571abc6c032c8c3a7ffa0674e803ef0c7e0219 -md5=d418e644c04e55872ce3d7b6de007dbe -cksum=559088366 upstream_url=https://pypi.io/packages/py3/m/meson/meson-VERSION-py3-none-any.whl diff --git a/build/pkgs/meson_python/checksums.ini b/build/pkgs/meson_python/checksums.ini index 94babc2deb2..7aa199d18fb 100644 --- a/build/pkgs/meson_python/checksums.ini +++ b/build/pkgs/meson_python/checksums.ini @@ -1,6 +1,4 @@ tarball=meson_python-VERSION.tar.gz sha1=71bf382c2f2e76aada2f511a84bd59a99a6b1238 sha256=fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f -md5=e91eb9946d7bb8be06e434c5a2dadd05 -cksum=535820777 upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz diff --git a/build/pkgs/mistune/checksums.ini b/build/pkgs/mistune/checksums.ini index f280961eb16..93397f7ab48 100644 --- a/build/pkgs/mistune/checksums.ini +++ b/build/pkgs/mistune/checksums.ini @@ -1,6 +1,4 @@ tarball=mistune-VERSION.tar.gz sha1=c15d02c98d04a3e615c3c1932d1b9a3b1759067a sha256=9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808 -md5=a4437edb22cf6519a7c61730fecb1a3f -cksum=2925260381 upstream_url=https://pypi.io/packages/source/m/mistune/mistune-VERSION.tar.gz diff --git a/build/pkgs/modular_decomposition/checksums.ini b/build/pkgs/modular_decomposition/checksums.ini index bc288889dc7..f113e676bb1 100644 --- a/build/pkgs/modular_decomposition/checksums.ini +++ b/build/pkgs/modular_decomposition/checksums.ini @@ -1,5 +1,3 @@ tarball=modular_decomposition-VERSION.tar.bz2 sha1=b0ce6d839d1cd2e93d806e70b13bc40bcdbaf9e9 sha256=cf2a950c5d2b320770afb0cda195e5df46a24c4fd5056906ca9502260b33446b -md5=9bc5245c5fab9df4f45c8e10c27cf3b8 -cksum=2034006428 diff --git a/build/pkgs/modular_resolution/checksums.ini b/build/pkgs/modular_resolution/checksums.ini index 54254d45fc5..681841188f2 100644 --- a/build/pkgs/modular_resolution/checksums.ini +++ b/build/pkgs/modular_resolution/checksums.ini @@ -1,6 +1,4 @@ tarball=modular_resolution-VERSION.tar.gz sha1=09ee61b1f9a33fb3e9bf0b658f81d3ede5748328 sha256=87b36c8c6ecc5dfe7a2594ce3ea35bb937d3b1a566860ddc138cac33dffc4490 -md5=0e59e69a46014b8935c5e081d3bfc57a -cksum=2981185519 upstream_url=https://github.com/sagemath/modular_resolution/releases/download/VERSION/modular_resolution-VERSION.tar.gz diff --git a/build/pkgs/mpc/checksums.ini b/build/pkgs/mpc/checksums.ini index 43c148cd976..378d9f58370 100644 --- a/build/pkgs/mpc/checksums.ini +++ b/build/pkgs/mpc/checksums.ini @@ -1,6 +1,4 @@ tarball=mpc-VERSION.tar.gz sha1=bac1c1fa79f5602df1e29e4684e103ad55714e02 sha256=ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 -md5=5c9bc658c9fd0f940e8e3e0f09530c62 -cksum=3202795598 upstream_url=https://ftp.gnu.org/gnu/mpc/mpc-VERSION.tar.gz diff --git a/build/pkgs/mpfi/checksums.ini b/build/pkgs/mpfi/checksums.ini index c8aa0690ed6..e776cbb2a25 100644 --- a/build/pkgs/mpfi/checksums.ini +++ b/build/pkgs/mpfi/checksums.ini @@ -1,5 +1,3 @@ tarball=mpfi-VERSION.tar.bz2 sha1=6a44e59f69fa72b4fe1c67b9c9ccf678f321ef80 sha256=c04f52cb306824b91b6d6eacf4f675b91fdee47c30f14d5b346dbfcd2492d274 -md5=1c233f3646bfb8a363aee0cc653c8baa -cksum=4291278873 diff --git a/build/pkgs/mpfr/checksums.ini b/build/pkgs/mpfr/checksums.ini index f3c5070dd31..4a1b68cfe48 100644 --- a/build/pkgs/mpfr/checksums.ini +++ b/build/pkgs/mpfr/checksums.ini @@ -1,6 +1,4 @@ tarball=mpfr-VERSION.tar.bz2 sha1=f9dbe49b092e4c8e0a039e6d46c059696cc2f51c sha256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0 -md5=7765afa036e4ce7fb0e02bce0fef894b -cksum=1526077734 upstream_url=https://www.mpfr.org/mpfr-current/mpfr-VERSION.tar.bz2 diff --git a/build/pkgs/mpfrcx/checksums.ini b/build/pkgs/mpfrcx/checksums.ini index d7b842075ba..0cc2a0a2c05 100644 --- a/build/pkgs/mpfrcx/checksums.ini +++ b/build/pkgs/mpfrcx/checksums.ini @@ -1,6 +1,4 @@ tarball=mpfrcx-VERSION.tar.gz sha1=460bc7cb48fae4f8070b73912080fdf0c08c93b6 sha256=9da9b3614c0a3e00e6ed2b82fc935d1c838d97074dc59cb388f8fafbe3db8594 -md5=45077ba92dccc25488086962d160de6c -cksum=1142118879 upstream_url=https://www.multiprecision.org/downloads/mpfrcx-VERSION.tar.gz diff --git a/build/pkgs/mpmath/checksums.ini b/build/pkgs/mpmath/checksums.ini index 73aa8267990..e6964d7c004 100644 --- a/build/pkgs/mpmath/checksums.ini +++ b/build/pkgs/mpmath/checksums.ini @@ -1,6 +1,4 @@ tarball=mpmath-VERSION.tar.gz sha1=b7c00f35eb35978197c8f5afc11a8b4b994dd382 sha256=7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f -md5=d5d17bbefea73eeb959967351d905306 -cksum=1852385672 upstream_url=https://files.pythonhosted.org/packages/source/m/mpmath/mpmath-VERSION.tar.gz diff --git a/build/pkgs/nauty/checksums.ini b/build/pkgs/nauty/checksums.ini index 4be1d99bdfe..9663569c7c4 100644 --- a/build/pkgs/nauty/checksums.ini +++ b/build/pkgs/nauty/checksums.ini @@ -1,6 +1,4 @@ tarball=nauty${VERSION}.tar.gz sha1=672e9fc9dfd07201af37ee65807a9b493331ed92 sha256=159d2156810a6bb240410cd61eb641add85088d9f15c888cdaa37b8681f929ce -md5=16c6edc1a8747c9281041b7c7092135f -cksum=2663136901 upstream_url=https://pallini.di.uniroma1.it/nauty${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}.tar.gz diff --git a/build/pkgs/nbclient/checksums.ini b/build/pkgs/nbclient/checksums.ini index 40061482cbf..6290bb30c93 100644 --- a/build/pkgs/nbclient/checksums.ini +++ b/build/pkgs/nbclient/checksums.ini @@ -1,6 +1,4 @@ tarball=nbclient-VERSION-py3-none-any.whl sha1=fcb4ad9b3ea1bea4d305076c0a7640a483bd11f3 sha256=25e861299e5303a0477568557c4045eccc7a34c17fc08e7959558707b9ebe548 -md5=db61a38c8b66b5b9c7f6f0c7c7de8f26 -cksum=2793018181 upstream_url=https://pypi.io/packages/py3/n/nbclient/nbclient-VERSION-py3-none-any.whl diff --git a/build/pkgs/nbconvert/checksums.ini b/build/pkgs/nbconvert/checksums.ini index 89e92025bac..56a861567e4 100644 --- a/build/pkgs/nbconvert/checksums.ini +++ b/build/pkgs/nbconvert/checksums.ini @@ -1,6 +1,4 @@ tarball=nbconvert-VERSION-py3-none-any.whl sha1=5317fa68bbd7f66fc3fcc5b0e6b0d6e2df967ba0 sha256=39fe4b8bdd1b0104fdd86fc8a43a9077ba64c720bda4c6132690d917a0a154ee -md5=ad534f2db53d8677b790be0e98992f8e -cksum=2885634129 upstream_url=https://pypi.io/packages/py3/n/nbconvert/nbconvert-VERSION-py3-none-any.whl diff --git a/build/pkgs/nbformat/checksums.ini b/build/pkgs/nbformat/checksums.ini index f9652f065b0..e7a225cadfe 100644 --- a/build/pkgs/nbformat/checksums.ini +++ b/build/pkgs/nbformat/checksums.ini @@ -1,6 +1,4 @@ tarball=nbformat-VERSION-py3-none-any.whl sha1=e38af74817e9d81101583363d9ffe349f0038eb9 sha256=1c5172d786a41b82bcfd0c23f9e6b6f072e8fb49c39250219e4acfff1efe89e9 -md5=0821545beba702b7001ad5bd744c89ba -cksum=2633499795 upstream_url=https://pypi.io/packages/py3/n/nbformat/nbformat-VERSION-py3-none-any.whl diff --git a/build/pkgs/ncurses/checksums.ini b/build/pkgs/ncurses/checksums.ini index 71ccb5a6d1e..1e4d3ce8d6c 100644 --- a/build/pkgs/ncurses/checksums.ini +++ b/build/pkgs/ncurses/checksums.ini @@ -1,6 +1,4 @@ tarball=ncurses-VERSION.tar.gz sha1=38fb1462d13b04bb900adf07918725c4b7ed0682 sha256=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 -md5=a2736befde5fee7d2b7eb45eb281cdbe -cksum=981463359 upstream_url=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-VERSION.tar.gz diff --git a/build/pkgs/nest_asyncio/checksums.ini b/build/pkgs/nest_asyncio/checksums.ini index b27ded6de0f..2e37d5585ca 100644 --- a/build/pkgs/nest_asyncio/checksums.ini +++ b/build/pkgs/nest_asyncio/checksums.ini @@ -1,6 +1,4 @@ tarball=nest_asyncio-VERSION.tar.gz sha1=e7d8036f6558011c5ae0c649e0af21eb530044d3 sha256=25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb -md5=9f0fe9ca229b1eef6e1ffba266413616 -cksum=3560927178 upstream_url=https://pypi.io/packages/source/n/nest_asyncio/nest_asyncio-VERSION.tar.gz diff --git a/build/pkgs/networkx/checksums.ini b/build/pkgs/networkx/checksums.ini index 9d70be95af7..7e02c083c6d 100644 --- a/build/pkgs/networkx/checksums.ini +++ b/build/pkgs/networkx/checksums.ini @@ -1,6 +1,4 @@ tarball=networkx-VERSION.tar.gz sha1=b12cf95ed8bc3fe568e3c8e023473a3767c43f8d sha256=9f1bb5cf3409bf324e0a722c20bdb4c20ee39bf1c30ce8ae499c8502b0b5e0c6 -md5=e81583dcb3d929b60660721912f3faed -cksum=2601544693 upstream_url=https://pypi.io/packages/source/n/networkx/networkx-VERSION.tar.gz diff --git a/build/pkgs/ninja_build/checksums.ini b/build/pkgs/ninja_build/checksums.ini index 414d4af563d..d640d72d1fc 100644 --- a/build/pkgs/ninja_build/checksums.ini +++ b/build/pkgs/ninja_build/checksums.ini @@ -1,6 +1,4 @@ tarball=ninja_build-VERSION.tar.gz sha1=938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3 sha256=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea -md5=32151c08211d7ca3c1d832064f6939b0 -cksum=4040304461 upstream_url=https://github.com/ninja-build/ninja/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/normaliz/checksums.ini b/build/pkgs/normaliz/checksums.ini index 1c6ae086e54..acb6e5cde7f 100644 --- a/build/pkgs/normaliz/checksums.ini +++ b/build/pkgs/normaliz/checksums.ini @@ -1,6 +1,4 @@ tarball=normaliz-VERSION.tar.gz sha1=d3c4e554c6a5ccf4fd04147e7744a63e3def1766 sha256=365e1d1e2a338dc4df1947a440e606bb66dd261307e617905e8eca64eaafcf6e -md5=1c7a7833ad180ef4e0e4f124ed398973 -cksum=3124231015 upstream_url=https://github.com/Normaliz/Normaliz/releases/download/vVERSION/normaliz-VERSION.tar.gz diff --git a/build/pkgs/notebook/checksums.ini b/build/pkgs/notebook/checksums.ini index af5d1c53219..2c1fd65675e 100644 --- a/build/pkgs/notebook/checksums.ini +++ b/build/pkgs/notebook/checksums.ini @@ -1,6 +1,4 @@ tarball=notebook-VERSION-py3-none-any.whl sha1=90ec65091058ac541a55cc2417de83c1bcb24985 sha256=197d8e0595acabf4005851c8716e952a81b405f7aefb648067a761fbde267ce7 -md5=bf0fe0b56048113cd8a9e2df7add9fe9 -cksum=1004716816 upstream_url=https://pypi.io/packages/py3/n/notebook/notebook-VERSION-py3-none-any.whl diff --git a/build/pkgs/notebook_shim/checksums.ini b/build/pkgs/notebook_shim/checksums.ini index 8ed750568bd..001afb43e00 100644 --- a/build/pkgs/notebook_shim/checksums.ini +++ b/build/pkgs/notebook_shim/checksums.ini @@ -1,6 +1,4 @@ tarball=notebook_shim-VERSION-py3-none-any.whl sha1=9bb3dce360ce69aec99f873d8e80c1e9fdf92fde sha256=a83496a43341c1674b093bfcebf0fe8e74cbe7eda5fd2bbc56f8e39e1486c0c7 -md5=f2207bef3d00f9b2dc14b0eeec63460d -cksum=2703250856 upstream_url=https://pypi.io/packages/py3/n/notebook_shim/notebook_shim-VERSION-py3-none-any.whl diff --git a/build/pkgs/notedown/checksums.ini b/build/pkgs/notedown/checksums.ini index 3cab5e2bc68..b8d26fb8b32 100644 --- a/build/pkgs/notedown/checksums.ini +++ b/build/pkgs/notedown/checksums.ini @@ -1,5 +1,3 @@ tarball=notedown-VERSION.tar.gz sha1=9af1839933b4978fba9d2290c2fe39a5de2d02fe sha256=36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee -md5=00d72f37e8a64d7f4c66ea8e0d214236 -cksum=2709668480 diff --git a/build/pkgs/ntl/checksums.ini b/build/pkgs/ntl/checksums.ini index 6f6698bc2b1..f3b58e77570 100644 --- a/build/pkgs/ntl/checksums.ini +++ b/build/pkgs/ntl/checksums.ini @@ -1,6 +1,4 @@ tarball=ntl-VERSION.tar.gz sha1=a55050ca07fb42c6f9e9a479b6f80be6f1f77886 sha256=210d06c31306cbc6eaf6814453c56c776d9d8e8df36d74eb306f6a523d1c6a8a -md5=abd887865df30c02609210a86cb953b1 -cksum=322384454 upstream_url=https://src.fedoraproject.org/repo/pkgs/ntl/ntl-11.5.1.tar.gz/sha512/cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f/ntl-11.5.1.tar.gz diff --git a/build/pkgs/numpy/checksums.ini b/build/pkgs/numpy/checksums.ini index 10865a00c4d..fde72f78b6d 100644 --- a/build/pkgs/numpy/checksums.ini +++ b/build/pkgs/numpy/checksums.ini @@ -1,6 +1,4 @@ tarball=numpy-VERSION.tar.gz sha1=915414f1efabd7c183583154cf1a709bd2745828 sha256=697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4 -md5=1c915dc6c36dd4c674d9379e9470ff8b -cksum=161965903 upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.tar.gz diff --git a/build/pkgs/openblas/checksums.ini b/build/pkgs/openblas/checksums.ini index 7e00848d23a..e05d9117e1f 100644 --- a/build/pkgs/openblas/checksums.ini +++ b/build/pkgs/openblas/checksums.ini @@ -1,6 +1,4 @@ tarball=openblas-VERSION.tar.gz sha1=af6dce0e486e684be842053fcbd98eaf97e39749 sha256=4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 -md5=bd496a1c81769ed19a161c1f8f904ccd -cksum=1399957963 upstream_url=https://github.com/xianyi/OpenBLAS/archive/vVERSION.tar.gz diff --git a/build/pkgs/openssl/checksums.ini b/build/pkgs/openssl/checksums.ini index 16421b3fe12..6e2b7e18955 100644 --- a/build/pkgs/openssl/checksums.ini +++ b/build/pkgs/openssl/checksums.ini @@ -1,6 +1,4 @@ tarball=openssl-VERSION.tar.gz sha1=b48e20c07facfdf6da9ad43a6c5126d51897699b sha256=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 -md5=e6a199cdf867873eef2c6491b674edbc -cksum=391245670 upstream_url=https://www.openssl.org/source/openssl-VERSION.tar.gz diff --git a/build/pkgs/osqp_python/checksums.ini b/build/pkgs/osqp_python/checksums.ini index 8ea4b8fee7c..d8e1ae4b81b 100644 --- a/build/pkgs/osqp_python/checksums.ini +++ b/build/pkgs/osqp_python/checksums.ini @@ -1,6 +1,4 @@ tarball=osqp-VERSION.tar.gz sha1=3358e48aa6d81496665a8b0ee157465ce6cd329a sha256=03e460e683ec2ce0f839353ddfa3c4c8ffa509ab8cf6a2b2afbb586fa453e180 -md5=22ee4f843ca15a98437f053e47d15e3d -cksum=2552259420 upstream_url=https://pypi.io/packages/source/o/osqp/osqp-VERSION.tar.gz diff --git a/build/pkgs/overrides/checksums.ini b/build/pkgs/overrides/checksums.ini index 1f155f1fc0f..2812a196d90 100644 --- a/build/pkgs/overrides/checksums.ini +++ b/build/pkgs/overrides/checksums.ini @@ -1,6 +1,4 @@ tarball=overrides-VERSION-py3-none-any.whl sha1=740e9e607a9e4f78dea7a1b82bcb27f285bc5f48 sha256=3ad24583f86d6d7a49049695efe9933e67ba62f0c7625d53c59fa832ce4b8b7d -md5=ed4ab0bd43112d05105576f0a50f5aa7 -cksum=3865068538 upstream_url=https://pypi.io/packages/py3/o/overrides/overrides-VERSION-py3-none-any.whl diff --git a/build/pkgs/p_group_cohomology/checksums.ini b/build/pkgs/p_group_cohomology/checksums.ini index 21c1a5a188e..d375c41b162 100644 --- a/build/pkgs/p_group_cohomology/checksums.ini +++ b/build/pkgs/p_group_cohomology/checksums.ini @@ -1,6 +1,4 @@ tarball=p_group_cohomology-VERSION.tar.xz sha1=d1d9a54f212a6de7d6a7e3afff80ffc3475264ad sha256=c958ffe8d56a5349372b2842da0c54c788cb0b1bc81bcebf8fb1d155320ae018 -md5=9a57cd7dd045dfd5e014473d543060c2 -cksum=2489285741 upstream_url=https://github.com/sagemath/p_group_cohomology/releases/download/vVERSION/p_group_cohomology-VERSION.tar.xz diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini index 1add37fb719..f5076243e35 100644 --- a/build/pkgs/packaging/checksums.ini +++ b/build/pkgs/packaging/checksums.ini @@ -1,6 +1,4 @@ tarball=packaging-VERSION-py3-none-any.whl sha1=d3fb436d835b252ea884a5d172d7265220127f95 sha256=8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7 -md5=f6e9c6af858bd34eff07b407d3f650a1 -cksum=3531019080 upstream_url=https://pypi.io/packages/py3/p/packaging/packaging-VERSION-py3-none-any.whl diff --git a/build/pkgs/palettable/checksums.ini b/build/pkgs/palettable/checksums.ini index 0e275bd8ec4..1ec683df7d8 100644 --- a/build/pkgs/palettable/checksums.ini +++ b/build/pkgs/palettable/checksums.ini @@ -1,6 +1,4 @@ tarball=palettable-VERSION.tar.gz sha1=4bdbbeae7f20bc71ce8246cb5269da2c3046ad62 sha256=72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd -md5=a7601ef44fafa2b8914fa1f9626d860e -cksum=3558581833 upstream_url=https://pypi.io/packages/source/p/palettable/palettable-VERSION.tar.gz diff --git a/build/pkgs/palp/checksums.ini b/build/pkgs/palp/checksums.ini index cb931869561..8e579188a92 100644 --- a/build/pkgs/palp/checksums.ini +++ b/build/pkgs/palp/checksums.ini @@ -1,6 +1,4 @@ tarball=palp-VERSION.tar.gz sha1=99b0d8f7c998549f9f1be6302950659ff01bac77 sha256=0540e827b1b481a55285146377b3910991cd6bc8da67f351c15226eec6a95702 -md5=b9508b9e08954215c88320d4a5940d91 -cksum=2027098672 upstream_url=http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-VERSION.tar.gz diff --git a/build/pkgs/pandoc_attributes/checksums.ini b/build/pkgs/pandoc_attributes/checksums.ini index bcef3442416..44da773ed63 100644 --- a/build/pkgs/pandoc_attributes/checksums.ini +++ b/build/pkgs/pandoc_attributes/checksums.ini @@ -1,5 +1,3 @@ tarball=pandoc_attributes-VERSION.zip sha1=e06bdb16ece5ea6aa64d93ef1ea6c836fe971c5d sha256=b6fc22f658c7d65a551ef7700e8e08e445bdadf626c5e5c617187f586882af00 -md5=dd541a17acd84f398e29dc57d1add4ae -cksum=723213323 diff --git a/build/pkgs/pandocfilters/checksums.ini b/build/pkgs/pandocfilters/checksums.ini index e9178670bec..d85750a17f7 100644 --- a/build/pkgs/pandocfilters/checksums.ini +++ b/build/pkgs/pandocfilters/checksums.ini @@ -1,6 +1,4 @@ tarball=pandocfilters-VERSION.tar.gz sha1=bdee4f81063c02168b421640f3e18917011153df sha256=0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38 -md5=d625fec43c27f091e465ff28df763a66 -cksum=1628002258 upstream_url=https://pypi.io/packages/source/p/pandocfilters/pandocfilters-VERSION.tar.gz diff --git a/build/pkgs/pari/checksums.ini b/build/pkgs/pari/checksums.ini index 364c257a3d7..12c05141bf1 100644 --- a/build/pkgs/pari/checksums.ini +++ b/build/pkgs/pari/checksums.ini @@ -1,6 +1,4 @@ tarball=pari-VERSION.tar.gz sha1=ae962671b5bf86849d2021113dfb5b2f59331a10 sha256=c3545bfee0c6dfb40b77fb4bbabaf999d82e60069b9f6d28bcb6cf004c8c5c0f -md5=4ab5c81d93f4bccb94e483b8b48fc336 -cksum=598072677 upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz diff --git a/build/pkgs/pari_elldata/checksums.ini b/build/pkgs/pari_elldata/checksums.ini index a41202a5e2b..165db556b19 100644 --- a/build/pkgs/pari_elldata/checksums.ini +++ b/build/pkgs/pari_elldata/checksums.ini @@ -1,5 +1,3 @@ tarball=elldata.tgz sha1=85f51ef85390f0f737fba10567d7d47f99249780 sha256=6c909f09bb19c8a8125145b1aac3758915daa7fd03530bc909dcb460d4eecb38 -md5=0ae49b7aa6a012ccd2804bfb831d3686 -cksum=1365963558 diff --git a/build/pkgs/pari_galdata/checksums.ini b/build/pkgs/pari_galdata/checksums.ini index fe645765774..d35a0e09eec 100644 --- a/build/pkgs/pari_galdata/checksums.ini +++ b/build/pkgs/pari_galdata/checksums.ini @@ -1,5 +1,3 @@ tarball=pari_galdata-VERSION.tar.bz2 sha1=4ae710687cb711c49645314c28d53ab3b3a38706 sha256=3d3ce1cec77a523971f53c225b78ed8bdd23e2fbfce03742d93a65a8fe4021cf -md5=b661c455bb1b2028b3b957d3bc8595de -cksum=3937576682 diff --git a/build/pkgs/pari_galpol/checksums.ini b/build/pkgs/pari_galpol/checksums.ini index c335e7fc4ba..b6acb470f5d 100644 --- a/build/pkgs/pari_galpol/checksums.ini +++ b/build/pkgs/pari_galpol/checksums.ini @@ -1,5 +1,3 @@ tarball=galpol.tgz sha1=b072d752207bf598c86c896dc2ce35314fd9aff4 sha256=562af28316ee335ee38c1172c2d5ecccb79f55c368fb9f2c6f40fc0f416bb01b -md5=6ebd6057f1b252f7f9b77525c27f447d -cksum=547352040 diff --git a/build/pkgs/pari_jupyter/checksums.ini b/build/pkgs/pari_jupyter/checksums.ini index 10a8f3e392b..bdd7d5278be 100644 --- a/build/pkgs/pari_jupyter/checksums.ini +++ b/build/pkgs/pari_jupyter/checksums.ini @@ -1,6 +1,4 @@ tarball=pari-jupyter-VERSION.tar.gz sha1=b410ee0352cd58f5f140246540b71b5ff83ddf73 sha256=7cd9291d05b92b8303c6ae8cf25622e5ecbab1ac2bcf13911f900ea987471b9d -md5=5a8353259bbaec1f0314d1b1b726c9cb -cksum=1481362803 upstream_url=https://pypi.io/packages/source/p/pari_jupyter/pari-jupyter-VERSION.tar.gz diff --git a/build/pkgs/pari_nftables/checksums.ini b/build/pkgs/pari_nftables/checksums.ini index c7393260f2f..c613d0a86e6 100644 --- a/build/pkgs/pari_nftables/checksums.ini +++ b/build/pkgs/pari_nftables/checksums.ini @@ -1,5 +1,3 @@ tarball=nftables.tgz sha1=90df66222346b0dbca68925671a374f5e286daeb sha256=8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92 -md5=82788524f36bbbba886785c940c859db -cksum=1478870095 diff --git a/build/pkgs/pari_seadata/checksums.ini b/build/pkgs/pari_seadata/checksums.ini index 4f9c4f3072b..05eb1542ba1 100644 --- a/build/pkgs/pari_seadata/checksums.ini +++ b/build/pkgs/pari_seadata/checksums.ini @@ -1,5 +1,3 @@ tarball=seadata.tgz sha1=fa3deb36df0ce71a466eb0ff0d4a18d48d44e8b9 sha256=c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833 -md5=6e9c119ccb3c65916a48e1a8cd899558 -cksum=3015139491 diff --git a/build/pkgs/pari_seadata_small/checksums.ini b/build/pkgs/pari_seadata_small/checksums.ini index 92e4f20adbf..5e8d8eb033a 100644 --- a/build/pkgs/pari_seadata_small/checksums.ini +++ b/build/pkgs/pari_seadata_small/checksums.ini @@ -1,5 +1,3 @@ tarball=pari_seadata_small-VERSION.tar.bz2 sha1=9df70728bfae81fad4ff66a3c7f57d99bbe70732 sha256=1992496212a965958ac36bb14c8e59d87086261c18d70aa4bc45ae4da464dcda -md5=5a9a6200e4536d2c6b4020c4313721f5 -cksum=3561726107 diff --git a/build/pkgs/parso/checksums.ini b/build/pkgs/parso/checksums.ini index bb4b8e263b9..caae59d79e8 100644 --- a/build/pkgs/parso/checksums.ini +++ b/build/pkgs/parso/checksums.ini @@ -1,6 +1,4 @@ tarball=parso-VERSION.tar.gz sha1=1a34ea6e597a6498ef5c154195f9ffe8dda3d254 sha256=8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 -md5=7ee251113f31f8d851c4a5d9e98977cb -cksum=566121311 upstream_url=https://pypi.io/packages/source/p/parso/parso-VERSION.tar.gz diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini index 717a911cfd4..9943634658e 100644 --- a/build/pkgs/patch/checksums.ini +++ b/build/pkgs/patch/checksums.ini @@ -1,5 +1,3 @@ tarball=patch-VERSION.tar.gz sha1=04d23f6e48e95efb07d12ccf44d1f35fb210f457 sha256=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f -md5=ed4d5674ef4543b4eb463db168886dc7 -cksum=2777655587 diff --git a/build/pkgs/patchelf/checksums.ini b/build/pkgs/patchelf/checksums.ini index 3181e199b48..b13ebbc4d64 100644 --- a/build/pkgs/patchelf/checksums.ini +++ b/build/pkgs/patchelf/checksums.ini @@ -1,6 +1,4 @@ tarball=patchelf-VERSION.tar.bz2 sha1=5d9c1690c0fbe70c312f43d597e04b6c1eeffc60 sha256=39e8aeccd7495d54df094d2b4a7c08010ff7777036faaf24f28e07777d1598e2 -md5=04d243d3626a33201b0d6eef0e2c4317 -cksum=92812155 upstream_url=https://github.com/NixOS/patchelf/releases/download/VERSION/patchelf-VERSION.tar.bz2 diff --git a/build/pkgs/pathspec/checksums.ini b/build/pkgs/pathspec/checksums.ini index c2f89e64a60..62d6d08775e 100644 --- a/build/pkgs/pathspec/checksums.ini +++ b/build/pkgs/pathspec/checksums.ini @@ -1,6 +1,4 @@ tarball=pathspec-VERSION-py3-none-any.whl sha1=e31b7b2b1a59ab192eb2e92ac283211a11039769 sha256=a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 -md5=53caa061bbda861c5b4766f41b084ec8 -cksum=1745881358 upstream_url=https://pypi.io/packages/py3/p/pathspec/pathspec-VERSION-py3-none-any.whl diff --git a/build/pkgs/perl_term_readline_gnu/checksums.ini b/build/pkgs/perl_term_readline_gnu/checksums.ini index c3e43ed79dc..4cfe731ee63 100644 --- a/build/pkgs/perl_term_readline_gnu/checksums.ini +++ b/build/pkgs/perl_term_readline_gnu/checksums.ini @@ -1,5 +1,3 @@ tarball=Term-ReadLine-Gnu-VERSION.tar.gz sha1=1f57fe986d56c6afa5eb868ca36dc5f0f8dcc3b6 sha256=575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125 -md5=514619d68bda1618da61b19d04b5cefe -cksum=677275902 diff --git a/build/pkgs/pexpect/checksums.ini b/build/pkgs/pexpect/checksums.ini index 7173f6dcf03..413053e79a1 100644 --- a/build/pkgs/pexpect/checksums.ini +++ b/build/pkgs/pexpect/checksums.ini @@ -1,6 +1,4 @@ tarball=pexpect-VERSION.tar.gz sha1=5bff9230c419eecbf701059f104e74a3f3a1b208 sha256=ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f -md5=f48d48325ee7f1221add0396ea9e2f14 -cksum=2367435032 upstream_url=https://pypi.io/packages/source/p/pexpect/pexpect-VERSION.tar.gz diff --git a/build/pkgs/pickleshare/checksums.ini b/build/pkgs/pickleshare/checksums.ini index d27650dfb10..c29bd06194f 100644 --- a/build/pkgs/pickleshare/checksums.ini +++ b/build/pkgs/pickleshare/checksums.ini @@ -1,5 +1,3 @@ tarball=pickleshare-VERSION.tar.gz sha1=c583011994ee0733ea4a6330af81c175180dcc3d sha256=87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca -md5=44ab782615894a812ab96669a122a634 -cksum=1895214791 diff --git a/build/pkgs/pillow/checksums.ini b/build/pkgs/pillow/checksums.ini index e528e33d751..7e64940e75b 100644 --- a/build/pkgs/pillow/checksums.ini +++ b/build/pkgs/pillow/checksums.ini @@ -1,6 +1,4 @@ tarball=Pillow-VERSION.tar.gz sha1=be2dc6aeee145894f3ccbc2358a37f7849e710aa sha256=e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 -md5=a55618c5d2fd64048dd3ea41bc39f7cd -cksum=3616378816 upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz diff --git a/build/pkgs/pint/checksums.ini b/build/pkgs/pint/checksums.ini index 848eb608be8..7e883f32e55 100644 --- a/build/pkgs/pint/checksums.ini +++ b/build/pkgs/pint/checksums.ini @@ -1,6 +1,4 @@ tarball=Pint-VERSION.tar.gz sha1=c14ac08ca2d5a68d79ea7cd2252dc7e2a572c56a sha256=387cf04078dc7dfe4a708033baad54ab61d82ab06c4ee3d4922b1e45d5626067 -md5=522a8e633e487e92ba54ccbec395947a -cksum=2139030399 upstream_url=https://pypi.io/packages/source/p/pint/Pint-VERSION.tar.gz diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini index 71a0b0a27cf..4967f48e584 100644 --- a/build/pkgs/pip/checksums.ini +++ b/build/pkgs/pip/checksums.ini @@ -1,6 +1,4 @@ tarball=pip-VERSION-py3-none-any.whl sha1=4b2baddc0673f73017e531648a9ee27e47925e7a sha256=55eb67bb6171d37447e82213be585b75fe2b12b359e993773aca4de9247a052b -md5=5d2d058044a3ae2800d18e358ddc72ca -cksum=1470281176 upstream_url=https://pypi.io/packages/py3/p/pip/pip-VERSION-py3-none-any.whl diff --git a/build/pkgs/pkgconf/checksums.ini b/build/pkgs/pkgconf/checksums.ini index 2d0338f34c5..ec43fd8c4c3 100644 --- a/build/pkgs/pkgconf/checksums.ini +++ b/build/pkgs/pkgconf/checksums.ini @@ -1,6 +1,4 @@ tarball=pkgconf-VERSION.tar.xz sha1=2b76eb2d88b2c4aecba937b337d218a13b67f14b sha256=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf -md5=823212dc241793df8ff1d097769a3473 -cksum=896868382 upstream_url=https://distfiles.dereferenced.org/pkgconf/pkgconf-VERSION.tar.xz diff --git a/build/pkgs/pkgconfig/checksums.ini b/build/pkgs/pkgconfig/checksums.ini index ece11e3d368..4ecbe8c0096 100644 --- a/build/pkgs/pkgconfig/checksums.ini +++ b/build/pkgs/pkgconfig/checksums.ini @@ -1,6 +1,4 @@ tarball=pkgconfig-VERSION-py3-none-any.whl sha1=bca14b2806a8e8afb0bd04f8e3675550b286dda8 sha256=d20023bbeb42ee6d428a0fac6e0904631f545985a10cdd71a20aa58bc47a4209 -md5=80f1e06563f3af0f090694db58736455 -cksum=15738577 upstream_url=https://pypi.io/packages/py3/p/pkgconfig/pkgconfig-VERSION-py3-none-any.whl diff --git a/build/pkgs/planarity/checksums.ini b/build/pkgs/planarity/checksums.ini index f5b0e9b8ca0..06b8d7622c6 100644 --- a/build/pkgs/planarity/checksums.ini +++ b/build/pkgs/planarity/checksums.ini @@ -1,6 +1,4 @@ tarball=planarity-VERSION.tar.gz sha1=8407bccf33c07bf0dae22d79b5e6ac7d89c62ea3 sha256=63e979d37e7160e4e72a286a8dd7ba74e4795f63742f417c8ba1cea2b2a51280 -md5=200116e6a67544c8e94f9de7c3ba1b1a -cksum=4207261512 upstream_url=http://users.ox.ac.uk/~coml0531/sage/planarity-VERSION.tar.gz diff --git a/build/pkgs/plantri/checksums.ini b/build/pkgs/plantri/checksums.ini index 4975c4e0e3d..1ba9d0dc2aa 100644 --- a/build/pkgs/plantri/checksums.ini +++ b/build/pkgs/plantri/checksums.ini @@ -1,6 +1,4 @@ tarball=plantri${VERSION_MAJOR}${VERSION_MINOR}.tar.gz sha1=a04aec2fa90c43f1c9bef59d041a54d8fa5bf562 sha256=5036804de6e3bee7bd54b6e46009a2c1f7c89067010b5e532cda84907a3559a2 -md5=ea765b3508dd56384f94ad1f032e2dd4 -cksum=3200215885 upstream_url=https://users.cecs.anu.edu.au/~bdm/plantri/plantri${VERSION_MAJOR}${VERSION_MINOR}.tar.gz diff --git a/build/pkgs/platformdirs/checksums.ini b/build/pkgs/platformdirs/checksums.ini index 896ef48c4f2..95e8aaddf16 100644 --- a/build/pkgs/platformdirs/checksums.ini +++ b/build/pkgs/platformdirs/checksums.ini @@ -1,6 +1,4 @@ tarball=platformdirs-VERSION-py3-none-any.whl sha1=cafa761738da959f2df0a8a92da4c72fd8eaf93e sha256=11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380 -md5=487007776ff343efc509b68d08cd7fd7 -cksum=162426958 upstream_url=https://pypi.io/packages/py3/p/platformdirs/platformdirs-VERSION-py3-none-any.whl diff --git a/build/pkgs/pluggy/checksums.ini b/build/pkgs/pluggy/checksums.ini index 5aaa610b023..80a46179d43 100644 --- a/build/pkgs/pluggy/checksums.ini +++ b/build/pkgs/pluggy/checksums.ini @@ -1,6 +1,4 @@ tarball=pluggy-VERSION-py3-none-any.whl sha1=25492905db99a151fc86368f0cca518a5ee5a832 sha256=d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7 -md5=9d0a58f023a0642eebae7c19f2729b72 -cksum=273236458 upstream_url=https://pypi.io/packages/py3/p/pluggy/pluggy-VERSION-py3-none-any.whl diff --git a/build/pkgs/ply/checksums.ini b/build/pkgs/ply/checksums.ini index acd937e47ac..f1003c4c4a0 100644 --- a/build/pkgs/ply/checksums.ini +++ b/build/pkgs/ply/checksums.ini @@ -1,6 +1,4 @@ tarball=ply-VERSION.tar.gz sha1=10a555a32095991fbc7f7ed10c677a14e21fad1d sha256=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 -md5=6465f602e656455affcd7c5734c638f8 -cksum=375283112 upstream_url=https://pypi.io/packages/source/p/ply/ply-VERSION.tar.gz diff --git a/build/pkgs/polylib/checksums.ini b/build/pkgs/polylib/checksums.ini index ea380bcd4f7..1ddf004b9f8 100644 --- a/build/pkgs/polylib/checksums.ini +++ b/build/pkgs/polylib/checksums.ini @@ -1,5 +1,3 @@ tarball=polylib-VERSION.tar.gz sha1=72b23c09a50ce9583c419e8376544630d6f99ea3 sha256=84622ff9dfa5d06f0c266960ed078bd3577a30fde6d7f8bed1041b9838cb731f -md5=c0088786e0a5ae64b7cc47ad19ae4f83 -cksum=116350713 diff --git a/build/pkgs/polymake/checksums.ini b/build/pkgs/polymake/checksums.ini index 4cfef370157..b76cd23ad88 100644 --- a/build/pkgs/polymake/checksums.ini +++ b/build/pkgs/polymake/checksums.ini @@ -1,6 +1,4 @@ tarball=polymake-VERSION-minimal.tar.bz2 sha1=0445f1a6d174906317a07c4bef299d0b4502c779 sha256=5df6f0acd700119bd0c4b5766762852ffbd857765b5dcc88802ff5d2108add23 -md5=7a86d17822f229d6088dd7d65c8c1cad -cksum=2732048385 upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2 diff --git a/build/pkgs/polytopes_db/checksums.ini b/build/pkgs/polytopes_db/checksums.ini index 8bc43fcca2a..afbc690ce11 100644 --- a/build/pkgs/polytopes_db/checksums.ini +++ b/build/pkgs/polytopes_db/checksums.ini @@ -1,5 +1,3 @@ tarball=polytopes_db-VERSION.tar.bz2 sha1=6a9d12740588ea5c0efc0e82776d8386e7887b47 sha256=cb788bdfca6e00864ec0bfa67932a68ae68bfeb9c527a91be90ad218026a0ce0 -md5=64c5fba9568891a2dbde5d433ce668e2 -cksum=3276110922 diff --git a/build/pkgs/polytopes_db_4d/checksums.ini b/build/pkgs/polytopes_db_4d/checksums.ini index 478eaa27ef8..bdcbebe37f9 100644 --- a/build/pkgs/polytopes_db_4d/checksums.ini +++ b/build/pkgs/polytopes_db_4d/checksums.ini @@ -1,6 +1,4 @@ tarball=polytopes_db_4d-VERSION.spkg sha1=c9779821e365df2d7f9bc684f9e2ec0e95fb8650 sha256=44fb1552261acca8b9e2e3253098ea3f364663bc48343fdbd121951bf02b8e55 -md5=fe775a26fd7b2afc187e9bfabfb1b86a -cksum=3415837678 upstream_url=http://ftp.sparcs.org/sage/spkg/huge/polytopes_db_4d-VERSION.spkg diff --git a/build/pkgs/ppl/checksums.ini b/build/pkgs/ppl/checksums.ini index da1649c5c6e..9e2bc4cc0e1 100644 --- a/build/pkgs/ppl/checksums.ini +++ b/build/pkgs/ppl/checksums.ini @@ -1,5 +1,3 @@ tarball=ppl-VERSION.tar.bz2 sha1=727ac98a9365a617dc26bfd7961417d9d3ff4e74 sha256=2d470b0c262904f190a19eac57fb5c2387b1bfc3510de25a08f3c958df62fdf1 -md5=50a757d37cced76e51b97709a4cf455a -cksum=158857820 diff --git a/build/pkgs/pplpy/checksums.ini b/build/pkgs/pplpy/checksums.ini index 3a16862ca85..76268f169e2 100644 --- a/build/pkgs/pplpy/checksums.ini +++ b/build/pkgs/pplpy/checksums.ini @@ -1,6 +1,4 @@ tarball=pplpy-VERSION.tar.gz sha1=dc9e8a7a867ee1c066bdbecf22b6a59dc2052711 sha256=db7a3b571d6ef053f75137975e947c3a1c1e45a30bab90eaf215b4e5cc15797e -md5=220fc7ab95d7bd62d40acb276f9b149f -cksum=2156962833 upstream_url=https://pypi.io/packages/source/p/pplpy/pplpy-VERSION.tar.gz diff --git a/build/pkgs/primecount/checksums.ini b/build/pkgs/primecount/checksums.ini index 504d1ff1150..c3f0b9ce77d 100644 --- a/build/pkgs/primecount/checksums.ini +++ b/build/pkgs/primecount/checksums.ini @@ -1,6 +1,4 @@ tarball=primecount-VERSION.tar.gz sha1=3854ef6c7f454086f31aa80d68f628c5b685d702 sha256=e9a1fa2c41b9a7b84f2bead21b53cc9f7e2a5a0a34ddd818431a4e789aa44230 -md5=a566d9b95ccc01f0c7c1329ca4c06b89 -cksum=1260437024 upstream_url=https://github.com/kimwalisch/primecount/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/primecountpy/checksums.ini b/build/pkgs/primecountpy/checksums.ini index 8b594df6f17..57cae477764 100644 --- a/build/pkgs/primecountpy/checksums.ini +++ b/build/pkgs/primecountpy/checksums.ini @@ -1,6 +1,4 @@ tarball=primecountpy-VERSION.tar.gz sha1=3526784adad04d67a15f05fb1367d12ec50a59dc sha256=78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676 -md5=e25806cba603d04cc7bc1852df5d0b92 -cksum=4293153144 upstream_url=https://pypi.io/packages/source/p/primecountpy/primecountpy-VERSION.tar.gz diff --git a/build/pkgs/primesieve/checksums.ini b/build/pkgs/primesieve/checksums.ini index 67625270518..faae4fa7982 100644 --- a/build/pkgs/primesieve/checksums.ini +++ b/build/pkgs/primesieve/checksums.ini @@ -1,6 +1,4 @@ tarball=primesieve-VERSION.tar.gz sha1=cb0a7c49b37b51980fc610d3041b9591c67a460c sha256=b29a7ec855764ce7474d00be03e1d83209bd097faa3778382dfb73a06866097e -md5=73f51a77b0d43356b404999e777ad910 -cksum=1567518743 upstream_url=https://github.com/kimwalisch/primesieve/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/prometheus_client/checksums.ini b/build/pkgs/prometheus_client/checksums.ini index e1224c3fee3..9f4fa1845da 100644 --- a/build/pkgs/prometheus_client/checksums.ini +++ b/build/pkgs/prometheus_client/checksums.ini @@ -1,6 +1,4 @@ tarball=prometheus_client-VERSION.tar.gz sha1=dabd66e652ea8275b4980e337cefcea68cc0b560 sha256=5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a -md5=295568805ef560acd16eecb18137ef30 -cksum=1955633542 upstream_url=https://pypi.io/packages/source/p/prometheus-client/prometheus_client-VERSION.tar.gz diff --git a/build/pkgs/prompt_toolkit/checksums.ini b/build/pkgs/prompt_toolkit/checksums.ini index 7cdac0864b7..3f4bd25570c 100644 --- a/build/pkgs/prompt_toolkit/checksums.ini +++ b/build/pkgs/prompt_toolkit/checksums.ini @@ -1,6 +1,4 @@ tarball=prompt_toolkit-VERSION.tar.gz sha1=b5ada8cb45c11f9184c990bd33a98d3d690e6edc sha256=3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d -md5=f33c0f4ae8d11addababf6d90c98f8bc -cksum=1262534330 upstream_url=https://pypi.io/packages/source/p/prompt_toolkit/prompt_toolkit-VERSION.tar.gz diff --git a/build/pkgs/psutil/checksums.ini b/build/pkgs/psutil/checksums.ini index 6c2656fb44f..417c2210384 100644 --- a/build/pkgs/psutil/checksums.ini +++ b/build/pkgs/psutil/checksums.ini @@ -1,6 +1,4 @@ tarball=psutil-VERSION.tar.gz sha1=24c493ef33d4df44e76a1801e480b4185bd911c5 sha256=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a -md5=eec35090e7474e471a12f0dd16c981f9 -cksum=3278898496 upstream_url=https://pypi.io/packages/source/p/psutil/psutil-VERSION.tar.gz diff --git a/build/pkgs/ptyprocess/checksums.ini b/build/pkgs/ptyprocess/checksums.ini index a3645e536f8..36a12e0f438 100644 --- a/build/pkgs/ptyprocess/checksums.ini +++ b/build/pkgs/ptyprocess/checksums.ini @@ -1,6 +1,4 @@ tarball=ptyprocess-VERSION.tar.gz sha1=2d8830d1025c8e33149c7723c2f283122f9488c1 sha256=5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220 -md5=9da200c397cb1752209a6b718b6cfc68 -cksum=2094263560 upstream_url=https://pypi.io/packages/source/p/ptyprocess/ptyprocess-VERSION.tar.gz diff --git a/build/pkgs/pure_eval/checksums.ini b/build/pkgs/pure_eval/checksums.ini index bf1b13dabd5..7fb86e03cc4 100644 --- a/build/pkgs/pure_eval/checksums.ini +++ b/build/pkgs/pure_eval/checksums.ini @@ -1,6 +1,4 @@ tarball=pure_eval-VERSION.tar.gz sha1=45813e75b359573c2ef49430673812ea3f8f81f2 sha256=2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 -md5=212fd27ca2c58d9effddec69748d738a -cksum=757891676 upstream_url=https://pypi.io/packages/source/p/pure_eval/pure_eval-VERSION.tar.gz diff --git a/build/pkgs/py/checksums.ini b/build/pkgs/py/checksums.ini index 27761c54a3c..9c10e7b6cf8 100644 --- a/build/pkgs/py/checksums.ini +++ b/build/pkgs/py/checksums.ini @@ -1,6 +1,4 @@ tarball=py-VERSION.tar.gz sha1=bb8aa4f56e3ced1cd61906495150e7ca2dacc10b sha256=51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 -md5=bde7dcc1cb452a1e10206ef2f811ba88 -cksum=1774689161 upstream_url=https://pypi.io/packages/source/p/py/py-VERSION.tar.gz diff --git a/build/pkgs/pybind11/checksums.ini b/build/pkgs/pybind11/checksums.ini index 5d2fda8c628..c3112e54327 100644 --- a/build/pkgs/pybind11/checksums.ini +++ b/build/pkgs/pybind11/checksums.ini @@ -1,6 +1,4 @@ tarball=pybind11-VERSION.tar.gz sha1=3c75333a9056f0be18eb612803cd46a2bb0c87fc sha256=00cd59116a6e8155aecd9174f37ba299d1d397ed4a6b86ac1dfe01b3e40f2cc4 -md5=67c58224e41c442e47fa84e7789c2c39 -cksum=419587142 upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz diff --git a/build/pkgs/pycosat/checksums.ini b/build/pkgs/pycosat/checksums.ini index d7d50d5daf8..7e70a7f5476 100644 --- a/build/pkgs/pycosat/checksums.ini +++ b/build/pkgs/pycosat/checksums.ini @@ -1,5 +1,3 @@ tarball=pycosat-VERSION.tar.gz sha1=1c2243fcc52491db8aa11558d4df626f28311757 sha256=abcaf3d6afb332b0d8363590d0aaa81f00f71142900fbae2608f7d595d5e4492 -md5=08e378db1c15dc1668bc62897bd325a5 -cksum=2006887185 diff --git a/build/pkgs/pycparser/checksums.ini b/build/pkgs/pycparser/checksums.ini index 129119057cb..1e113dfcbf8 100644 --- a/build/pkgs/pycparser/checksums.ini +++ b/build/pkgs/pycparser/checksums.ini @@ -1,6 +1,4 @@ tarball=pycparser-VERSION.tar.gz sha1=359c718c6ece361047f61846b9fa4ea0239576dc sha256=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 -md5=48f7d743bf018f7bb2ffc5fb976d1492 -cksum=1065143416 upstream_url=https://pypi.io/packages/source/p/pycparser/pycparser-VERSION.tar.gz diff --git a/build/pkgs/pygments/checksums.ini b/build/pkgs/pygments/checksums.ini index 1f06c35b718..c534a4a9a4d 100644 --- a/build/pkgs/pygments/checksums.ini +++ b/build/pkgs/pygments/checksums.ini @@ -1,6 +1,4 @@ tarball=pygments-VERSION-py3-none-any.whl sha1=053e17b72ffea04e200d7b34edbe0f96b4b68e4b sha256=b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c -md5=05bab8cd38860c62d6e146ec2949fefe -cksum=964137483 upstream_url=https://pypi.io/packages/py3/p/pygments/pygments-VERSION-py3-none-any.whl diff --git a/build/pkgs/pynormaliz/checksums.ini b/build/pkgs/pynormaliz/checksums.ini index 08b0154f025..25b41b1c0ab 100644 --- a/build/pkgs/pynormaliz/checksums.ini +++ b/build/pkgs/pynormaliz/checksums.ini @@ -1,6 +1,4 @@ tarball=PyNormaliz-VERSION.tar.gz sha1=08617ca50ce0e0317a3377381bf37c1a0ab826c1 sha256=359218cf35f400c43f338a132b7887f6a2affb05057c4e7eaa315a9f2b6a8b39 -md5=9ae78f7638741c26b588443f0d6024ce -cksum=4090940781 upstream_url=https://pypi.io/packages/source/p/pynormaliz/PyNormaliz-VERSION.tar.gz diff --git a/build/pkgs/pyparsing/checksums.ini b/build/pkgs/pyparsing/checksums.ini index 339595c5a3f..7c946098d45 100644 --- a/build/pkgs/pyparsing/checksums.ini +++ b/build/pkgs/pyparsing/checksums.ini @@ -1,6 +1,4 @@ tarball=pyparsing-VERSION-py3-none-any.whl sha1=c44cd9476ad90a48af0f27d8f7966136b2a93fc6 sha256=32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb -md5=314b4874edfbc558e02f89d371043e9f -cksum=3947575213 upstream_url=https://pypi.io/packages/py3/p/pyparsing/pyparsing-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_api/checksums.ini b/build/pkgs/pyproject_api/checksums.ini index 240b5e9e3e0..cb551b5f7dd 100644 --- a/build/pkgs/pyproject_api/checksums.ini +++ b/build/pkgs/pyproject_api/checksums.ini @@ -1,6 +1,4 @@ tarball=pyproject_api-VERSION-py3-none-any.whl sha1=5ea24c784a68fd0ef0228c332dc078ce64387eb8 sha256=4c0116d60476b0786c88692cf4e325a9814965e2469c5998b830bba16b183675 -md5=8941280ffec3eb79a8cd6e380774980f -cksum=913049079 upstream_url=https://pypi.io/packages/py3/p/pyproject_api/pyproject_api-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_metadata/checksums.ini b/build/pkgs/pyproject_metadata/checksums.ini index f7bc77910bd..446d55ef265 100644 --- a/build/pkgs/pyproject_metadata/checksums.ini +++ b/build/pkgs/pyproject_metadata/checksums.ini @@ -1,6 +1,4 @@ tarball=pyproject-metadata-VERSION.tar.gz sha1=41fba5c33917d77b9364fadb76e590e86789634d sha256=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67 -md5=ca5e9527cff96153a976e14530b53746 -cksum=2053869519 upstream_url=https://pypi.io/packages/source/p/pyproject_metadata/pyproject-metadata-VERSION.tar.gz diff --git a/build/pkgs/pyrsistent/checksums.ini b/build/pkgs/pyrsistent/checksums.ini index d27f97b471f..b7a30f5a171 100644 --- a/build/pkgs/pyrsistent/checksums.ini +++ b/build/pkgs/pyrsistent/checksums.ini @@ -1,6 +1,4 @@ tarball=pyrsistent-VERSION.tar.gz sha1=79980873658f7634ae25758b9710088b62e0612a sha256=1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 -md5=761266eab1f9dc9280cdb0a6d2dedb08 -cksum=2666822194 upstream_url=https://pypi.io/packages/source/p/pyrsistent/pyrsistent-VERSION.tar.gz diff --git a/build/pkgs/pysingular/checksums.ini b/build/pkgs/pysingular/checksums.ini index d9faed7471a..9f26a37fc9b 100644 --- a/build/pkgs/pysingular/checksums.ini +++ b/build/pkgs/pysingular/checksums.ini @@ -1,6 +1,4 @@ tarball=PySingular-VERSION.tar.gz sha1=c8d4bbe4552490aac37afe6d87a2cd3a7b445a7e sha256=ca03d1d7538fc61f4350acff42708c6c443e0232712a2dc42ce72140831ef60c -md5=84a8639d33a5b03637a7ca3ea322b085 -cksum=822399760 upstream_url=https://pypi.io/packages/source/p/pysingular/PySingular-VERSION.tar.gz diff --git a/build/pkgs/python3/checksums.ini b/build/pkgs/python3/checksums.ini index 4e0a51185d6..6d7cdcdd58d 100644 --- a/build/pkgs/python3/checksums.ini +++ b/build/pkgs/python3/checksums.ini @@ -1,6 +1,4 @@ tarball=Python-VERSION.tar.xz sha1=89ee31611b73dc0c32c178d15aa208734b462c5a sha256=85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f -md5=4efe92adf28875c77d3b9b2e8d3bc44a -cksum=2916176597 upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz diff --git a/build/pkgs/python_igraph/checksums.ini b/build/pkgs/python_igraph/checksums.ini index b3366a07c2e..ecdc7ea2dfe 100644 --- a/build/pkgs/python_igraph/checksums.ini +++ b/build/pkgs/python_igraph/checksums.ini @@ -1,6 +1,4 @@ tarball=python-igraph-VERSION.tar.gz sha1=ef7ee85cb1bc83109c744d5dd6bbe5e37598ce3f sha256=e55df60f882a51b8e8c1c5e7e940c5f90685d75634ea6df63bebcc983397adfa -md5=788bd70bd286651774f15b20af956081 -cksum=1447848766 upstream_url=https://pypi.io/packages/source/i/igraph/igraph-VERSION.tar.gz diff --git a/build/pkgs/python_json_logger/checksums.ini b/build/pkgs/python_json_logger/checksums.ini index 9442f838eea..2856b66a14f 100644 --- a/build/pkgs/python_json_logger/checksums.ini +++ b/build/pkgs/python_json_logger/checksums.ini @@ -1,6 +1,4 @@ tarball=python_json_logger-VERSION-py3-none-any.whl sha1=c1176f521d95b5452b6169943b2b9b259e024b39 sha256=f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd -md5=618fc5f196be90261afa8372eb458f47 -cksum=349551342 upstream_url=https://pypi.io/packages/py3/p/python_json_logger/python_json_logger-VERSION-py3-none-any.whl diff --git a/build/pkgs/pytz/checksums.ini b/build/pkgs/pytz/checksums.ini index a034f2a4d9a..8ff6396f13e 100644 --- a/build/pkgs/pytz/checksums.ini +++ b/build/pkgs/pytz/checksums.ini @@ -1,6 +1,4 @@ tarball=pytz-VERSION.tar.gz sha1=be3f14bc0d6b89b8c579d8ae4e0fcb4478ff92e6 sha256=7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b -md5=84e6569fcc917b096cca1063819c4ab0 -cksum=3925580206 upstream_url=https://pypi.io/packages/source/p/pytz/pytz-VERSION.tar.gz diff --git a/build/pkgs/pytz_deprecation_shim/checksums.ini b/build/pkgs/pytz_deprecation_shim/checksums.ini index b7ad7588b93..199685f084c 100644 --- a/build/pkgs/pytz_deprecation_shim/checksums.ini +++ b/build/pkgs/pytz_deprecation_shim/checksums.ini @@ -1,6 +1,4 @@ tarball=pytz_deprecation_shim-VERSION.tar.gz sha1=d7900c309c26d48f6499fbda955eb80bd0b437dd sha256=af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d -md5=f563b4bdc56f40acb2498fd1caf6dd1b -cksum=2491832159 upstream_url=https://pypi.io/packages/source/p/pytz_deprecation_shim/pytz_deprecation_shim-VERSION.tar.gz diff --git a/build/pkgs/pyyaml/checksums.ini b/build/pkgs/pyyaml/checksums.ini index 4d61e8acda8..1e9b9f74722 100644 --- a/build/pkgs/pyyaml/checksums.ini +++ b/build/pkgs/pyyaml/checksums.ini @@ -1,6 +1,4 @@ tarball=PyYAML-VERSION.tar.gz sha1=a80d802ad8f693bed34c8fb5ee168a1872663c9a sha256=bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 -md5=c9246277af2d9a13b7018af267a0831a -cksum=2585952669 upstream_url=https://pypi.io/packages/source/p/pyyaml/PyYAML-VERSION.tar.gz diff --git a/build/pkgs/pyzmq/checksums.ini b/build/pkgs/pyzmq/checksums.ini index 3a829c3a713..b4b99817bdc 100644 --- a/build/pkgs/pyzmq/checksums.ini +++ b/build/pkgs/pyzmq/checksums.ini @@ -1,6 +1,4 @@ tarball=pyzmq-VERSION.tar.gz sha1=f750e59a3d5fcca64d0a1a6723c1bc72173e976f sha256=259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23 -md5=993a646d3f1c6201a8c93bcb2d2f867e -cksum=2057198190 upstream_url=https://pypi.io/packages/source/p/pyzmq/pyzmq-VERSION.tar.gz diff --git a/build/pkgs/qdldl_python/checksums.ini b/build/pkgs/qdldl_python/checksums.ini index 9fabbb66254..a444f898ae6 100644 --- a/build/pkgs/qdldl_python/checksums.ini +++ b/build/pkgs/qdldl_python/checksums.ini @@ -1,6 +1,4 @@ tarball=qdldl-VERSION.tar.gz sha1=af76c57ca1787f5e44e42f6c9f916b84ae599f1f sha256=69c092f6e1fc23fb779a80a62e6fcdfe2eba05c925860248c4d6754f4736938f -md5=63d719bd8073c1661a1baa6b510b8aad -cksum=105675620 upstream_url=https://pypi.io/packages/source/q/qdldl/qdldl-VERSION.tar.gz diff --git a/build/pkgs/qepcad/checksums.ini b/build/pkgs/qepcad/checksums.ini index 7fae98da0ce..01f75bcc26e 100644 --- a/build/pkgs/qepcad/checksums.ini +++ b/build/pkgs/qepcad/checksums.ini @@ -1,6 +1,4 @@ tarball=qepcad-VERSION.tar.gz sha1=644324e1224350cc663e93c5ce99b93de0de26e3 sha256=075db8950ef2a6d11f099b85820363f7b4d61f4aff3425cb799d7567dc1254fc -md5=f368459cfab2d42caa40919e60093020 -cksum=783450087 upstream_url=https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/qepcad-B.VERSION.tgz diff --git a/build/pkgs/qhull/checksums.ini b/build/pkgs/qhull/checksums.ini index 7951f23d116..fd1421d5d62 100644 --- a/build/pkgs/qhull/checksums.ini +++ b/build/pkgs/qhull/checksums.ini @@ -1,6 +1,4 @@ tarball=qhull-VERSION.tgz sha1=2dbc240919560ac008a92363984754a70677b353 sha256=b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e -md5=295f7332269a38279478f555cc185296 -cksum=3092762704 upstream_url=http://www.qhull.org/download/qhull-VERSION.tgz diff --git a/build/pkgs/readline/checksums.ini b/build/pkgs/readline/checksums.ini index 29552114deb..5f3fbae748b 100644 --- a/build/pkgs/readline/checksums.ini +++ b/build/pkgs/readline/checksums.ini @@ -1,6 +1,4 @@ tarball=readline-VERSION.tar.gz sha1=8a05ad0d0ad67e18c383f1b2cf6a23bcbd46f87a sha256=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 -md5=12819fa739a78a6172400f399ab34f81 -cksum=829245750 upstream_url=https://ftp.gnu.org/gnu/readline/readline-VERSION.tar.gz diff --git a/build/pkgs/referencing/checksums.ini b/build/pkgs/referencing/checksums.ini index 8e2b7eb5b55..293629ca16d 100644 --- a/build/pkgs/referencing/checksums.ini +++ b/build/pkgs/referencing/checksums.ini @@ -1,6 +1,4 @@ tarball=referencing-VERSION-py3-none-any.whl sha1=9d710ba3a604d24ffded218a3813b5fd1fe2e495 sha256=160f24a7d2411dc82b1efd96dfb083ee9e5cc9bc8e492d323e0dd853989d37b3 -md5=d12db197f05a5c560011e40e1852e8fc -cksum=2747749685 upstream_url=https://pypi.io/packages/py3/r/referencing/referencing-VERSION-py3-none-any.whl diff --git a/build/pkgs/requests/checksums.ini b/build/pkgs/requests/checksums.ini index b8786646f0b..8b0dc85bd89 100644 --- a/build/pkgs/requests/checksums.ini +++ b/build/pkgs/requests/checksums.ini @@ -1,6 +1,4 @@ tarball=requests-VERSION-py3-none-any.whl sha1=60b928b15e05d04a33b880a0232e44258c777740 sha256=58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f -md5=0cb4b772a1a652cf3d170a6c42a69098 -cksum=1658568655 upstream_url=https://pypi.io/packages/py3/r/requests/requests-VERSION-py3-none-any.whl diff --git a/build/pkgs/rfc3339_validator/checksums.ini b/build/pkgs/rfc3339_validator/checksums.ini index 8947460155e..a0766fbec23 100644 --- a/build/pkgs/rfc3339_validator/checksums.ini +++ b/build/pkgs/rfc3339_validator/checksums.ini @@ -1,6 +1,4 @@ tarball=rfc3339_validator-VERSION-py2.py3-none-any.whl sha1=daa86cb641dfd6ebfef4ece6dea1be8fd63dec00 sha256=24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa -md5=e16fb743ff1c88d7c7de18890935b647 -cksum=2330309218 upstream_url=https://pypi.io/packages/py2.py3/r/rfc3339_validator/rfc3339_validator-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/rfc3986_validator/checksums.ini b/build/pkgs/rfc3986_validator/checksums.ini index a320dd09153..5d08b72ca0e 100644 --- a/build/pkgs/rfc3986_validator/checksums.ini +++ b/build/pkgs/rfc3986_validator/checksums.ini @@ -1,6 +1,4 @@ tarball=rfc3986_validator-VERSION-py2.py3-none-any.whl sha1=c0fabd5c0568cc516f9258f3e5846a04a059dc31 sha256=2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9 -md5=41aef4395cd3d560c96a3992534dfd53 -cksum=1606077510 upstream_url=https://pypi.io/packages/py2.py3/r/rfc3986_validator/rfc3986_validator-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/rpy2/checksums.ini b/build/pkgs/rpy2/checksums.ini index 5aaa662d045..62224bc62f8 100644 --- a/build/pkgs/rpy2/checksums.ini +++ b/build/pkgs/rpy2/checksums.ini @@ -1,6 +1,4 @@ tarball=rpy2-VERSION.tar.gz sha1=7d236c0c6982333b20b6a126f0c17a5481fea64b sha256=5d31a5ea43f5a59f6dec30faca87edb01fc9b8affa0beae96a99be923bd7dab3 -md5=8842b153925a2eca21e2552e964facbb -cksum=1249008138 upstream_url=https://pypi.io/packages/source/r/rpy2/rpy2-VERSION.tar.gz diff --git a/build/pkgs/rst2ipynb/checksums.ini b/build/pkgs/rst2ipynb/checksums.ini index 6a7cf3ed302..2248cc0a54a 100644 --- a/build/pkgs/rst2ipynb/checksums.ini +++ b/build/pkgs/rst2ipynb/checksums.ini @@ -1,6 +1,4 @@ tarball=rst2ipynb-VERSION.tar.gz sha1=98926df9a8336c8974f446a2a858458495b5aec4 sha256=30d70b0e96f1c37baad9c8dbe904fc2567354eec02c52b94e7c7287b6268eaa3 -md5=eedfb3d5b8634e36b680ad86771cec38 -cksum=3973650989 upstream_url=https://pypi.io/packages/source/r/rst2ipynb/rst2ipynb-VERSION.tar.gz diff --git a/build/pkgs/rubiks/checksums.ini b/build/pkgs/rubiks/checksums.ini index 772646b9312..f53803060f1 100644 --- a/build/pkgs/rubiks/checksums.ini +++ b/build/pkgs/rubiks/checksums.ini @@ -1,6 +1,4 @@ tarball=rubiks-VERSION-unix.tar.bz2 sha1=c12069ed1eb0fc19f80a474b1c4bad2d845f5e40 sha256=aae4c88c0f1cf84718c1a6e31e027a2886e9eaea65051385339fd98be8693e07 -md5=c1108799440f7f974e55ef967ae6642a -cksum=215946372 upstream_url=https://users.ox.ac.uk/~coml0531/tmp/rubiks-VERSION-unix.tar.bz2 diff --git a/build/pkgs/rw/checksums.ini b/build/pkgs/rw/checksums.ini index 78c10c711e4..c7bf058cd40 100644 --- a/build/pkgs/rw/checksums.ini +++ b/build/pkgs/rw/checksums.ini @@ -1,6 +1,4 @@ tarball=rw-VERSION.tar.gz sha1=5c9c8a5c2eda798f6b0fe5218ba08ef429e0aa9f sha256=c1e03506fe25cdfcb428c051fc56b2d2affb5b06fba3f2ce756631466befb441 -md5=829612ea322d64bc529ffbb6be42d97e -cksum=93091513 upstream_url=https://sourceforge.net/projects/rankwidth/files/rw-VERSION.tar.gz diff --git a/build/pkgs/saclib/checksums.ini b/build/pkgs/saclib/checksums.ini index 6b1f49754c1..1e7d0c75cfc 100644 --- a/build/pkgs/saclib/checksums.ini +++ b/build/pkgs/saclib/checksums.ini @@ -1,6 +1,4 @@ tarball=saclibVERSION.tar.gz sha1=6f37da451e1003b381e8a9dd7f60ec265021d061 sha256=e8e3acb253c64394f35c8e17942f764cae34df731f3fe3d749b6a2ae1fb8203b -md5=2a251651bc96a14eba4300f18ec4cbb4 -cksum=3062086094 upstream_url=https://www.usna.edu/Users/cs/wcbrown/qepcad/INSTALL/saclibVERSION.tgz diff --git a/build/pkgs/sage_numerical_backends_coin/checksums.ini b/build/pkgs/sage_numerical_backends_coin/checksums.ini index d003d483bf0..53ebb086e1c 100644 --- a/build/pkgs/sage_numerical_backends_coin/checksums.ini +++ b/build/pkgs/sage_numerical_backends_coin/checksums.ini @@ -1,6 +1,4 @@ tarball=sage_numerical_backends_coin-VERSION.tar.gz sha1=5c9708603564c55fa5fddf66ac06f68f4c6145e2 sha256=d48b7c550bc727f58ce28c03cc572f37e7e6267a0c73366aa6cf852c80af6a39 -md5=94ed7c290defc4bf16dcdb0e0c67ca35 -cksum=2355301440 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_coin/sage_numerical_backends_coin-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_cplex/checksums.ini b/build/pkgs/sage_numerical_backends_cplex/checksums.ini index 427419e0ca8..633b6676b48 100644 --- a/build/pkgs/sage_numerical_backends_cplex/checksums.ini +++ b/build/pkgs/sage_numerical_backends_cplex/checksums.ini @@ -1,6 +1,4 @@ tarball=sage_numerical_backends_cplex-VERSION.tar.gz sha1=59b5f344f5b3d2e1f2fb7dcddef208bcc99e710a sha256=4e4ce4464a26d1c0bb340273f0731f75b037550dc35afd143e95b94168f2eca1 -md5=f8dcd101092634dac83097a36d64c872 -cksum=2646359461 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_cplex/sage_numerical_backends_cplex-VERSION.tar.gz diff --git a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini index e1527e84d2c..70dc24885c2 100644 --- a/build/pkgs/sage_numerical_backends_gurobi/checksums.ini +++ b/build/pkgs/sage_numerical_backends_gurobi/checksums.ini @@ -1,6 +1,4 @@ tarball=sage_numerical_backends_gurobi-VERSION.tar.gz sha1=36a2bfa1cfa2f4fdcb9dc979e80177580bb7aac2 sha256=bb073ce2d7972aabafd2a074c46231204fe3a04d273b247ee9a03ca8938d17e0 -md5=0a77377fad705950c4b7b14b366ebaa6 -cksum=478792673 upstream_url=https://pypi.io/packages/source/s/sage_numerical_backends_gurobi/sage_numerical_backends_gurobi-VERSION.tar.gz diff --git a/build/pkgs/sagenb_export/checksums.ini b/build/pkgs/sagenb_export/checksums.ini index 1f0cac4ef17..cf021ab516f 100644 --- a/build/pkgs/sagenb_export/checksums.ini +++ b/build/pkgs/sagenb_export/checksums.ini @@ -1,5 +1,3 @@ tarball=sagenb_export-VERSION.tar.gz sha1=98d268fd21200482299b66196028d55dec923466 sha256=b642321ccd94da4d04afa12f33b6cea7c8db289f3283c6e39b3a50131780bb5a -md5=2f88a08db0d5dd39a9a27eec4cf16192 -cksum=607250687 diff --git a/build/pkgs/sagetex/checksums.ini b/build/pkgs/sagetex/checksums.ini index fef7fdede50..7cfac7e72f3 100644 --- a/build/pkgs/sagetex/checksums.ini +++ b/build/pkgs/sagetex/checksums.ini @@ -1,6 +1,4 @@ tarball=sagetex-VERSION.tar.gz sha1=821c8a6ab11ee651d0dcc599c5582fefb6706775 sha256=03162ec62cb86da13a747f982241af3e4f4cdd4d29fcba8fbb6c6982a9e906d9 -md5=a7ddbe41ea3d816e839ddda3ec28f89a -cksum=1768053059 upstream_url=https://pypi.io/packages/source/s/sagetex/sagetex-VERSION.tar.gz diff --git a/build/pkgs/scs/checksums.ini b/build/pkgs/scs/checksums.ini index 06fd33b6851..ceaf994ac5f 100644 --- a/build/pkgs/scs/checksums.ini +++ b/build/pkgs/scs/checksums.ini @@ -1,6 +1,4 @@ tarball=scs-VERSION.tar.gz sha1=92e4ff21b450c9659f610064eb79e804de9167b4 sha256=e3bd779e7e977e3ae5a2f2035aa4c2a309e29082d59a722d5d6592edc4bdb4b3 -md5=dc86b5ed0a0a22453bb88feacf31539a -cksum=4083736723 upstream_url=https://pypi.io/packages/source/s/scs/scs-VERSION.tar.gz diff --git a/build/pkgs/send2trash/checksums.ini b/build/pkgs/send2trash/checksums.ini index 19cd8b13542..d99aecb6b2f 100644 --- a/build/pkgs/send2trash/checksums.ini +++ b/build/pkgs/send2trash/checksums.ini @@ -1,6 +1,4 @@ tarball=Send2Trash-VERSION.tar.gz sha1=211092dcefa5468582f7d083472ad7f1880cc019 sha256=c132d59fa44b9ca2b1699af5c86f57ce9f4c5eb56629d5d55fbb7a35f84e2312 -md5=3fc7ff801bc76da65cf4e97d6b89025e -cksum=3017010359 upstream_url=https://pypi.io/packages/source/s/send2trash/Send2Trash-VERSION.tar.gz diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index 70f4231f73b..bba5aeee159 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,6 +1,4 @@ tarball=setuptools-VERSION-py3-none-any.whl sha1=4227225bb193e3a45542f45966caf777d4c913e8 sha256=1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2 -md5=f096ed836f4036a11aa277fa16dc09ff -cksum=263664173 upstream_url=https://pypi.io/packages/py3/s/setuptools/setuptools-VERSION-py3-none-any.whl diff --git a/build/pkgs/setuptools_scm/checksums.ini b/build/pkgs/setuptools_scm/checksums.ini index 2781aafd872..7d85feb982f 100644 --- a/build/pkgs/setuptools_scm/checksums.ini +++ b/build/pkgs/setuptools_scm/checksums.ini @@ -1,6 +1,4 @@ tarball=setuptools_scm-VERSION-py3-none-any.whl sha1=cfde7254fe351b69cd4bf02e1b57e0b3c59aa9a6 sha256=b47844cd2a84b83b3187a5782c71128c28b4c94cad8bfb871da2784a5cb54c4f -md5=4c054a609965886703ede26a4ba3206d -cksum=1360813947 upstream_url=https://pypi.io/packages/py3/s/setuptools_scm/setuptools_scm-VERSION-py3-none-any.whl diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini index 4ed707a0728..e6d353329ae 100644 --- a/build/pkgs/singular/checksums.ini +++ b/build/pkgs/singular/checksums.ini @@ -1,6 +1,4 @@ tarball=singular-VERSION.tar.gz sha1=0dd736f26935ed72999bb9a4bbb98c6df18ab9ea sha256=8f157d2c582614482285838345ed7a3629ad6dd0bfbbc16eed7cbee0ff69d072 -md5=0f9368193bad9a0c3dc84545b2404761 -cksum=1698641648 upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-2/singular-VERSION.tar.gz diff --git a/build/pkgs/singular_jupyter/checksums.ini b/build/pkgs/singular_jupyter/checksums.ini index 299b5dbfb32..7264f159769 100644 --- a/build/pkgs/singular_jupyter/checksums.ini +++ b/build/pkgs/singular_jupyter/checksums.ini @@ -1,5 +1,3 @@ tarball=jupyter_kernel_singular-VERSION.tar.gz sha1=e10d0894cac9ee111e34c6d6d6e409b26edf108f sha256=1cf81f2a166b548e49ebd6a7623f7fb6d618dc0ab08d28867ee60cc2c4a30d5a -md5=c2acfe07c1094200dac521d2e8dcb2a9 -cksum=970360836 diff --git a/build/pkgs/sirocco/checksums.ini b/build/pkgs/sirocco/checksums.ini index 43dd8cbb90c..19cbe71816c 100644 --- a/build/pkgs/sirocco/checksums.ini +++ b/build/pkgs/sirocco/checksums.ini @@ -1,6 +1,4 @@ tarball=libsirocco-VERSION.tar.gz sha1=23311c0944f0c128b493589c1575476cf88177b6 sha256=e86c9fe3b1f2cf0d3a7381d21c1fc4670f14b538c60c7cc6410ccb0f5b1fbaf8 -md5=e86b1dc9b72aee0d80186be7f49c295e -cksum=784051898 upstream_url=https://github.com/miguelmarco/SIROCCO2/releases/download/VERSION/libsirocco-VERSION.tar.gz diff --git a/build/pkgs/six/checksums.ini b/build/pkgs/six/checksums.ini index c768cb3e003..24f678da7eb 100644 --- a/build/pkgs/six/checksums.ini +++ b/build/pkgs/six/checksums.ini @@ -1,6 +1,4 @@ tarball=six-VERSION-py2.py3-none-any.whl sha1=79e6f2e4f9e24898f1896df379871b9c9922f147 sha256=8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 -md5=529d7fd7e14612ccde86417b4402d6f3 -cksum=2975792266 upstream_url=https://pypi.io/packages/py2.py3/s/six/six-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/sniffio/checksums.ini b/build/pkgs/sniffio/checksums.ini index b1fea86cf15..8379b1841d0 100644 --- a/build/pkgs/sniffio/checksums.ini +++ b/build/pkgs/sniffio/checksums.ini @@ -1,6 +1,4 @@ tarball=sniffio-VERSION-py3-none-any.whl sha1=16f883fd7e31aa383df8901002f9ce5cec7606e5 sha256=eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384 -md5=7890655ffc549d04087bbc2f93332034 -cksum=2528943486 upstream_url=https://pypi.io/packages/py3/s/sniffio/sniffio-VERSION-py3-none-any.whl diff --git a/build/pkgs/snowballstemmer/checksums.ini b/build/pkgs/snowballstemmer/checksums.ini index 76d580c6dcc..cab5be15660 100644 --- a/build/pkgs/snowballstemmer/checksums.ini +++ b/build/pkgs/snowballstemmer/checksums.ini @@ -1,6 +1,4 @@ tarball=snowballstemmer-VERSION.tar.gz sha1=aaf1b0e3b58d25e2e297ea3dbef59d8534ef8d92 sha256=09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 -md5=4332ddc7bbee0f344a03915b2ad59a54 -cksum=3477609484 upstream_url=https://pypi.io/packages/source/s/snowballstemmer/snowballstemmer-VERSION.tar.gz diff --git a/build/pkgs/soupsieve/checksums.ini b/build/pkgs/soupsieve/checksums.ini index 015cc6d527a..3e9ef0ba9fc 100644 --- a/build/pkgs/soupsieve/checksums.ini +++ b/build/pkgs/soupsieve/checksums.ini @@ -1,6 +1,4 @@ tarball=soupsieve-VERSION-py3-none-any.whl sha1=a155a6208211aa90bbc3bcfc9cab194a05000e59 sha256=eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7 -md5=80ebff671b2b8a346c2922b1feebf995 -cksum=275705301 upstream_url=https://pypi.io/packages/py3/s/soupsieve/soupsieve-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx/checksums.ini b/build/pkgs/sphinx/checksums.ini index 666748415f7..5cd194279be 100644 --- a/build/pkgs/sphinx/checksums.ini +++ b/build/pkgs/sphinx/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinx-VERSION-py3-none-any.whl sha1=d4155cf2dbd768db9431fddcb7f53dd67caf56e1 sha256=1e09160a40b956dc623c910118fa636da93bd3ca0b9876a7b3df90f07d691560 -md5=35ced785936bf05d6b2769a797b15adf -cksum=1007986807 upstream_url=https://pypi.io/packages/py3/s/sphinx/sphinx-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_basic_ng/checksums.ini b/build/pkgs/sphinx_basic_ng/checksums.ini index 3ebf6672603..4933de2fa24 100644 --- a/build/pkgs/sphinx_basic_ng/checksums.ini +++ b/build/pkgs/sphinx_basic_ng/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinx_basic_ng-VERSION-py3-none-any.whl sha1=abcd9bda6ae61bb20c52bf46c17fb1bbdfdab4ea sha256=eb09aedbabfb650607e9b4b68c9d240b90b1e1be221d6ad71d61c52e29f7932b -md5=39e1f6e303b3b485200b11abe9a5d552 -cksum=1539165518 upstream_url=https://pypi.io/packages/py3/s/sphinx_basic_ng/sphinx_basic_ng-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_copybutton/checksums.ini b/build/pkgs/sphinx_copybutton/checksums.ini index 05dacda0f75..1c83ae582e0 100644 --- a/build/pkgs/sphinx_copybutton/checksums.ini +++ b/build/pkgs/sphinx_copybutton/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinx_copybutton-VERSION-py3-none-any.whl sha1=a15e038b665225b13f7bd3eae6a2a64c8bd4b582 sha256=fb543fd386d917746c9a2c50360c7905b605726b9355cd26e9974857afeae06e -md5=6781b8e0c3f77c146776b07ab345402a -cksum=1069247069 upstream_url=https://pypi.io/packages/py3/s/sphinx_copybutton/sphinx_copybutton-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinx_inline_tabs/checksums.ini b/build/pkgs/sphinx_inline_tabs/checksums.ini index 31e4fb8f30c..93c03352650 100644 --- a/build/pkgs/sphinx_inline_tabs/checksums.ini +++ b/build/pkgs/sphinx_inline_tabs/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinx_inline_tabs-VERSION-py3-none-any.whl sha1=1404e320d0533280355e7e1e71cffd9937015027 sha256=06809ac613f7c48ddd6e2fa588413e3fe92cff2397b56e2ccf0b0218f9ef6a78 -md5=7373d0ebd34be8f9ac2ed62bc63f4582 -cksum=2708358042 upstream_url=https://pypi.io/packages/py3/s/sphinx_inline_tabs/sphinx_inline_tabs-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_applehelp/checksums.ini b/build/pkgs/sphinxcontrib_applehelp/checksums.ini index 480a910b715..25ebbacf69a 100644 --- a/build/pkgs/sphinxcontrib_applehelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_applehelp/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_applehelp-VERSION-py3-none-any.whl sha1=e426527562da2c5c520b27c58210cd1d44a1185b sha256=cb61eb0ec1b61f349e5cc36b2028e9e7ca765be05e49641c97241274753067b4 -md5=2d4ea0fe463afb95f8c2ef125587934a -cksum=3631877161 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_applehelp/sphinxcontrib_applehelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_devhelp/checksums.ini b/build/pkgs/sphinxcontrib_devhelp/checksums.ini index c9c24b226b1..03e4c534a7a 100644 --- a/build/pkgs/sphinxcontrib_devhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_devhelp/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_devhelp-VERSION-py3-none-any.whl sha1=c1c774393d267d97eaf07f0e5c740f82af24d628 sha256=6485d09629944511c893fa11355bda18b742b83a2b181f9a009f7e500595c90f -md5=961a181d10d6d062ddaf5ed9321871f8 -cksum=1442746149 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_devhelp/sphinxcontrib_devhelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini index ce56c1f15e3..02f3fefa8df 100644 --- a/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_htmlhelp/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_htmlhelp-VERSION-py3-none-any.whl sha1=6b60c617a0fe98a663ca146edc03867581da5e07 sha256=393f04f112b4d2f53d93448d4bce35842f62b307ccdc549ec1585e950bc35e04 -md5=69b417211acf45aef9512adc660623c5 -cksum=3983023906 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_htmlhelp/sphinxcontrib_htmlhelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_jsmath/checksums.ini b/build/pkgs/sphinxcontrib_jsmath/checksums.ini index f1fd08665c6..5ad932e6f6c 100644 --- a/build/pkgs/sphinxcontrib_jsmath/checksums.ini +++ b/build/pkgs/sphinxcontrib_jsmath/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_jsmath-VERSION-py2.py3-none-any.whl sha1=beff4fc35d13a5f2883bc129f28ac031046195c5 sha256=2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178 -md5=4a9dbd97819fa713147472387ebd845d -cksum=747406250 upstream_url=https://pypi.io/packages/py2.py3/s/sphinxcontrib_jsmath/sphinxcontrib_jsmath-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_qthelp/checksums.ini b/build/pkgs/sphinxcontrib_qthelp/checksums.ini index ed38f599d94..bb35693af5e 100644 --- a/build/pkgs/sphinxcontrib_qthelp/checksums.ini +++ b/build/pkgs/sphinxcontrib_qthelp/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_qthelp-VERSION-py3-none-any.whl sha1=8f593bd6ca46487ed25ee0fca50f0d88b18e5f9e sha256=e2ae3b5c492d58fcbd73281fbd27e34b8393ec34a073c792642cd8e529288182 -md5=3d3730f8492cffc8394868adad27e378 -cksum=1687408767 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_qthelp/sphinxcontrib_qthelp-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini index d70f00e6278..292f6b2b195 100644 --- a/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini +++ b/build/pkgs/sphinxcontrib_serializinghtml/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_serializinghtml-VERSION-py3-none-any.whl sha1=a5198a72d1668e97fdda39a559586bcf57cb7278 sha256=326369b8df80a7d2d8d7f99aa5ac577f51ea51556ed974e7716cfd4fca3f6cb7 -md5=2c757ab993b2dd53bf3246188e2b37ad -cksum=1878315415 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_serializinghtml/sphinxcontrib_serializinghtml-VERSION-py3-none-any.whl diff --git a/build/pkgs/sphinxcontrib_websupport/checksums.ini b/build/pkgs/sphinxcontrib_websupport/checksums.ini index 4c29f251731..9964fd80b13 100644 --- a/build/pkgs/sphinxcontrib_websupport/checksums.ini +++ b/build/pkgs/sphinxcontrib_websupport/checksums.ini @@ -1,6 +1,4 @@ tarball=sphinxcontrib_websupport-VERSION-py3-none-any.whl sha1=649d1447a4773b665588060efda66344cb9b99a5 sha256=2dc179d7f821ebd54f31f93c894ca52435ebc5364e4e4dfb0da834ac119d51fd -md5=472e9b717e65a1c130bc02696b6801f8 -cksum=906870632 upstream_url=https://pypi.io/packages/py3/s/sphinxcontrib_websupport/sphinxcontrib_websupport-VERSION-py3-none-any.whl diff --git a/build/pkgs/sqlite/checksums.ini b/build/pkgs/sqlite/checksums.ini index f23bd2d117a..144a50566d4 100644 --- a/build/pkgs/sqlite/checksums.ini +++ b/build/pkgs/sqlite/checksums.ini @@ -1,6 +1,4 @@ tarball=sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz sha1=a4bcf9e951bfb9745214241ba08476299fc2dc1e sha256=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3 -md5=f5752052fc5b8e1b539af86a3671eac7 -cksum=763219165 upstream_url=https://www.sqlite.org/2021/sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz diff --git a/build/pkgs/stack_data/checksums.ini b/build/pkgs/stack_data/checksums.ini index d1f425ef43b..5761a624c1e 100644 --- a/build/pkgs/stack_data/checksums.ini +++ b/build/pkgs/stack_data/checksums.ini @@ -1,6 +1,4 @@ tarball=stack_data-VERSION.tar.gz sha1=7f7627afc47570ffb06924c1b2fbb48e21bac724 sha256=836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9 -md5=d04f7cda6589138e90691aec1edbf0d5 -cksum=4043168585 upstream_url=https://pypi.io/packages/source/s/stack_data/stack_data-VERSION.tar.gz diff --git a/build/pkgs/suitesparse/checksums.ini b/build/pkgs/suitesparse/checksums.ini index 26b3db1fd07..e05ee205baf 100644 --- a/build/pkgs/suitesparse/checksums.ini +++ b/build/pkgs/suitesparse/checksums.ini @@ -1,6 +1,4 @@ tarball=SuiteSparse-VERSION.tar.gz sha1=83dd96b32701e12b7577acb7d9aea80138d7e46e sha256=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee -md5=68bb912f3cf3d2b01f30ebafef690302 -cksum=178881779 upstream_url=https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/surf/checksums.ini b/build/pkgs/surf/checksums.ini index d3fea89dc8e..c0977836876 100644 --- a/build/pkgs/surf/checksums.ini +++ b/build/pkgs/surf/checksums.ini @@ -1,5 +1,3 @@ tarball=surf-VERSION.tar.gz sha1=570dc2ab09619a907d2f6a142b0d268082cfc003 sha256=f5e4c78c4c9c8b70e7aee2471db4b006eed2e0bd4afc0c19e3801a42c2c0a370 -md5=ca1a57804cc6efc7d14f285d54119b33 -cksum=2431066768 diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 88d92243d88..72907d5595e 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,6 +1,4 @@ tarball=symengine-VERSION.tar.gz sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd -md5=4074f3c76570bdc2ae9914edafa29eb6 -cksum=3782541135 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini index f8790fdfb4e..8706f117424 100644 --- a/build/pkgs/symengine_py/checksums.ini +++ b/build/pkgs/symengine_py/checksums.ini @@ -1,5 +1,4 @@ tarball=symengine.py-VERSION.tar.gz -sha1=4a8da0d0a057c8709c5b28543dbb3d26a060f013 -md5=d10f4ba5c27b09ef234fcafddf824ce5 -cksum=1332096394 +sha1=e461d072a6ba8f0082d6f187eba7f053343529c6 +sha256=8351c0267c2cd7866ff04c04261f06cd75af9a7130aac848ca43fd047404e229 upstream_url=https://pypi.io/packages/source/p/symengine/symengine-VERSION.tar.gz diff --git a/build/pkgs/symmetrica/checksums.ini b/build/pkgs/symmetrica/checksums.ini index afee6180891..07664bc3183 100644 --- a/build/pkgs/symmetrica/checksums.ini +++ b/build/pkgs/symmetrica/checksums.ini @@ -1,6 +1,4 @@ tarball=symmetrica-VERSION.tar.xz sha1=0044cc087ff04267c246e730c6570d89f6e593af sha256=05ae107ec41f38cada19c26b6d7884970cbafae6e3b55ec3964896230358b456 -md5=cd4716c26b5c625a012c22656113ef6f -cksum=1186250347 upstream_url=http://users.ox.ac.uk/~coml0531/sage/symmetrica-VERSION.tar.xz diff --git a/build/pkgs/sympow/checksums.ini b/build/pkgs/sympow/checksums.ini index d1fb79e008e..30eff47b596 100644 --- a/build/pkgs/sympow/checksums.ini +++ b/build/pkgs/sympow/checksums.ini @@ -1,6 +1,4 @@ tarball=sympow-vVERSION.tar.gz sha1=37a909c26009415197b5088a2f1b53dd3558f494 sha256=53631afa6c68dd008400681af0fe1d60ada36716215449f2a668853ed04455ac -md5=51f2c717c84ec9c2840af740751cf797 -cksum=1444149964 upstream_url=https://github.com/mkoeppe/sympow/releases/download/vVERSION/sympow-vVERSION.tar.gz diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini index a1fb95f04ed..4a8b9107b71 100644 --- a/build/pkgs/sympy/checksums.ini +++ b/build/pkgs/sympy/checksums.ini @@ -1,6 +1,4 @@ tarball=sympy-VERSION.tar.gz sha1=604968f191e2d69053b8310066d089f73a1bd109 sha256=ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8 -md5=3e0033109352d7303ea97b9216e16645 -cksum=2437095035 upstream_url=https://github.com/sympy/sympy/releases/download/sympy-VERSION/sympy-VERSION.tar.gz diff --git a/build/pkgs/tachyon/checksums.ini b/build/pkgs/tachyon/checksums.ini index f63a83f22ab..bd19e444c37 100644 --- a/build/pkgs/tachyon/checksums.ini +++ b/build/pkgs/tachyon/checksums.ini @@ -1,5 +1,3 @@ tarball=tachyon-VERSION.tar.bz2 sha1=9866dc93e129115994708efa6e7ca16e20d58237 sha256=e8888a410610e2726dca32f40f31ff34a83cb474b41e5a1e0ac8bbb175e1a466 -md5=fac22f4a5f675229bcc14264af4e7b81 -cksum=3876215200 diff --git a/build/pkgs/tdlib/checksums.ini b/build/pkgs/tdlib/checksums.ini index b2da7907fab..6f3275ad092 100644 --- a/build/pkgs/tdlib/checksums.ini +++ b/build/pkgs/tdlib/checksums.ini @@ -1,5 +1,3 @@ tarball=tdlib-VERSION.tar.gz sha1=8e200d0e3ac009030f3ada6658d20717e433220f sha256=5a40375e738e9e6dbd37f53e54deb1efa6b58f154d83b7bfeaee9f47d47b444b -md5=6bd9e7d9dae616079d511658f70eff73 -cksum=2382384273 diff --git a/build/pkgs/terminado/checksums.ini b/build/pkgs/terminado/checksums.ini index e68458b878d..ce9c0407bad 100644 --- a/build/pkgs/terminado/checksums.ini +++ b/build/pkgs/terminado/checksums.ini @@ -1,6 +1,4 @@ tarball=terminado-VERSION.tar.gz sha1=608fcc44b845e1fb783e361d59e79fba83126e14 sha256=6ccbbcd3a4f8a25a5ec04991f39a0b8db52dfcd487ea0e578d977e6752380333 -md5=aafcc42623986e42469712786edb127c -cksum=3344744872 upstream_url=https://pypi.io/packages/source/t/terminado/terminado-VERSION.tar.gz diff --git a/build/pkgs/texttable/checksums.ini b/build/pkgs/texttable/checksums.ini index 78205601114..3446dba447f 100644 --- a/build/pkgs/texttable/checksums.ini +++ b/build/pkgs/texttable/checksums.ini @@ -1,6 +1,4 @@ tarball=texttable-VERSION.tar.gz sha1=0fa175fa6e0fefea31434746641bedc8cbb60248 sha256=2d2068fb55115807d3ac77a4ca68fa48803e84ebb0ee2340f858107a36522638 -md5=e5d380c04fab132ccf0bbfd4f761bd51 -cksum=274394355 upstream_url=https://pypi.io/packages/source/t/texttable/texttable-VERSION.tar.gz diff --git a/build/pkgs/threejs/checksums.ini b/build/pkgs/threejs/checksums.ini index bd918595ed2..4786adc786f 100644 --- a/build/pkgs/threejs/checksums.ini +++ b/build/pkgs/threejs/checksums.ini @@ -1,6 +1,4 @@ tarball=threejs-sage-VERSION.tar.gz sha1=db7910b25fe9df7849528cffd06f2a40a90c82c0 sha256=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8 -md5=ba8faf405988e066d8ce7e176f3624f2 -cksum=2491453519 upstream_url=https://github.com/sagemath/threejs-sage/archive/VERSION.tar.gz diff --git a/build/pkgs/tides/checksums.ini b/build/pkgs/tides/checksums.ini index 7bc12bec45f..a54e2bdebd1 100644 --- a/build/pkgs/tides/checksums.ini +++ b/build/pkgs/tides/checksums.ini @@ -1,5 +1,3 @@ tarball=tides-VERSION.tar.gz sha1=2a70d8e08c364abff3314b9f15022aba2b62c1e7 sha256=9ba5490f7c22f7a56f23d29dcb314df9811bd82dd21d5e19b3cca5a9d86d919a -md5=200db1104c40f0c4f7bce806c773c87f -cksum=2240108013 diff --git a/build/pkgs/tinycss2/checksums.ini b/build/pkgs/tinycss2/checksums.ini index 94a7ec7c747..a6abd957086 100644 --- a/build/pkgs/tinycss2/checksums.ini +++ b/build/pkgs/tinycss2/checksums.ini @@ -1,6 +1,4 @@ tarball=tinycss2-VERSION.tar.gz sha1=3871ffec30bde346d1a17f80a423dce488bad4f7 sha256=8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627 -md5=e8a06102e7f42ca791463f11ce7b814d -cksum=1840765267 upstream_url=https://pypi.io/packages/source/t/tinycss2/tinycss2-VERSION.tar.gz diff --git a/build/pkgs/tomli/checksums.ini b/build/pkgs/tomli/checksums.ini index ae98bbacaa6..00d70337b2b 100644 --- a/build/pkgs/tomli/checksums.ini +++ b/build/pkgs/tomli/checksums.ini @@ -1,6 +1,4 @@ tarball=tomli-VERSION-py3-none-any.whl sha1=5bfc83c14bc54e6193a0d50a50c16a88eda0c4fa sha256=939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc -md5=a8a774971c6d046cf1c87cd801dd158f -cksum=891457836 upstream_url=https://pypi.io/packages/py3/t/tomli/tomli-VERSION-py3-none-any.whl diff --git a/build/pkgs/topcom/checksums.ini b/build/pkgs/topcom/checksums.ini index 4b0aca4660c..1a00b4da1ec 100644 --- a/build/pkgs/topcom/checksums.ini +++ b/build/pkgs/topcom/checksums.ini @@ -1,6 +1,4 @@ tarball=TOPCOM-1_1_2.tgz sha1=65db8c00309f3bf8467ee5ba9da109c196db3461 sha256=4fb10754ee5b76056441fea98f2c8dee5db6f2984d8c14283b49239ad4378ab6 -md5=dbda1ae7946251c9502444ee9b0a2c62 -cksum=1598684291 upstream_url=https://users.ox.ac.uk/~coml0531/tmp/TOPCOM-1_1_2.tgz diff --git a/build/pkgs/tornado/checksums.ini b/build/pkgs/tornado/checksums.ini index de0fb6fbe18..9cc0e020c01 100644 --- a/build/pkgs/tornado/checksums.ini +++ b/build/pkgs/tornado/checksums.ini @@ -1,6 +1,4 @@ tarball=tornado-VERSION.tar.gz sha1=5b4036313660a74034186ac63b10d244ca9444b8 sha256=72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee -md5=460b467761e5ff74202b5bf8054c8116 -cksum=3932629794 upstream_url=https://pypi.io/packages/source/t/tornado/tornado-VERSION.tar.gz diff --git a/build/pkgs/tox/checksums.ini b/build/pkgs/tox/checksums.ini index 573419f6dfc..fa5a87fb673 100644 --- a/build/pkgs/tox/checksums.ini +++ b/build/pkgs/tox/checksums.ini @@ -1,6 +1,4 @@ tarball=tox-VERSION-py3-none-any.whl sha1=d3312285c4988d3307d3b000a8a18cfcb16aea29 sha256=da761b4a57ee2b92b5ce39f48ff723fc42d185bf2af508effb683214efa662ea -md5=127a9d3fae61a0967f14ab6d59fd118f -cksum=4147794288 upstream_url=https://pypi.io/packages/py3/t/tox/tox-VERSION-py3-none-any.whl diff --git a/build/pkgs/traitlets/checksums.ini b/build/pkgs/traitlets/checksums.ini index 50752896807..4be4683da86 100644 --- a/build/pkgs/traitlets/checksums.ini +++ b/build/pkgs/traitlets/checksums.ini @@ -1,6 +1,4 @@ tarball=traitlets-VERSION.tar.gz sha1=9f4cb2a04ffba7029ad67bbec3d39a23e9095db2 sha256=fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772 -md5=63c6bb056dec2a062a854d90fa6b4933 -cksum=2387245107 upstream_url=https://pypi.io/packages/source/t/traitlets/traitlets-VERSION.tar.gz diff --git a/build/pkgs/trove_classifiers/checksums.ini b/build/pkgs/trove_classifiers/checksums.ini index be28f5e562f..1796b31d849 100644 --- a/build/pkgs/trove_classifiers/checksums.ini +++ b/build/pkgs/trove_classifiers/checksums.ini @@ -1,6 +1,4 @@ tarball=trove_classifiers-VERSION-py3-none-any.whl sha1=c341abee77b5c87d913b86dc587e544553f0658c sha256=02307750cbbac2b3d13078662f8a5bf077732bf506e9c33c97204b7f68f3699e -md5=78e67f128f53b8417134429192810701 -cksum=3034057088 upstream_url=https://pypi.io/packages/py3/t/trove_classifiers/trove_classifiers-VERSION-py3-none-any.whl diff --git a/build/pkgs/types_python_dateutil/checksums.ini b/build/pkgs/types_python_dateutil/checksums.ini index 1ba54d11802..6ebc189c635 100644 --- a/build/pkgs/types_python_dateutil/checksums.ini +++ b/build/pkgs/types_python_dateutil/checksums.ini @@ -1,6 +1,4 @@ tarball=types_python_dateutil-VERSION-py3-none-any.whl sha1=c039b93ad4b5f3ea1c6aac3d08386995e8c7b19e sha256=f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9 -md5=6281a2b67e2347366238ef28e3f8a070 -cksum=1399426019 upstream_url=https://pypi.io/packages/py3/t/types_python_dateutil/types_python_dateutil-VERSION-py3-none-any.whl diff --git a/build/pkgs/typing_extensions/checksums.ini b/build/pkgs/typing_extensions/checksums.ini index 4d9609b3641..2c1dd61052d 100644 --- a/build/pkgs/typing_extensions/checksums.ini +++ b/build/pkgs/typing_extensions/checksums.ini @@ -1,6 +1,4 @@ tarball=typing_extensions-VERSION-py3-none-any.whl sha1=84d6a73b5a5d303c9187a861d5eedd50da42e7a3 sha256=8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 -md5=9c84e613da80ced7a5e86329ec75dc6c -cksum=2951292774 upstream_url=https://pypi.io/packages/py3/t/typing_extensions/typing_extensions-VERSION-py3-none-any.whl diff --git a/build/pkgs/tzdata/checksums.ini b/build/pkgs/tzdata/checksums.ini index c5cb8ec1498..449a195f648 100644 --- a/build/pkgs/tzdata/checksums.ini +++ b/build/pkgs/tzdata/checksums.ini @@ -1,6 +1,4 @@ tarball=tzdata-VERSION-py2.py3-none-any.whl sha1=4686c7c91a01d5af9075903937c343afa05c141b sha256=7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda -md5=5e534124c0c916ab617421247649b193 -cksum=2929397850 upstream_url=https://pypi.io/packages/py2.py3/t/tzdata/tzdata-VERSION-py2.py3-none-any.whl diff --git a/build/pkgs/tzlocal/checksums.ini b/build/pkgs/tzlocal/checksums.ini index 74e426ab48c..5c246c69ced 100644 --- a/build/pkgs/tzlocal/checksums.ini +++ b/build/pkgs/tzlocal/checksums.ini @@ -1,6 +1,4 @@ tarball=tzlocal-VERSION.tar.gz sha1=1d61e52edddf882c9af4f5f3f1be0db3788dd7b5 sha256=46eb99ad4bdb71f3f72b7d24f4267753e240944ecfc16f25d2719ba89827a803 -md5=c209a72fd296ff6e1a98d55c2382ba79 -cksum=1644259932 upstream_url=https://pypi.io/packages/source/t/tzlocal/tzlocal-VERSION.tar.gz diff --git a/build/pkgs/uri_template/checksums.ini b/build/pkgs/uri_template/checksums.ini index d167dffc8ce..601b51db908 100644 --- a/build/pkgs/uri_template/checksums.ini +++ b/build/pkgs/uri_template/checksums.ini @@ -1,6 +1,4 @@ tarball=uri_template-VERSION-py3-none-any.whl sha1=bbc8808bdb7e687f0c099c8120cd901dc90bce69 sha256=a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363 -md5=7d7f28c2ffd7d4746174ab761f6025e5 -cksum=1943559906 upstream_url=https://pypi.io/packages/py3/u/uri_template/uri_template-VERSION-py3-none-any.whl diff --git a/build/pkgs/urllib3/checksums.ini b/build/pkgs/urllib3/checksums.ini index ae276d16d95..1fbf6f0991c 100644 --- a/build/pkgs/urllib3/checksums.ini +++ b/build/pkgs/urllib3/checksums.ini @@ -1,6 +1,4 @@ tarball=urllib3-VERSION-py3-none-any.whl sha1=1e197082cd0d0f98bc97f2fbfd7d2a597e3ff3e4 sha256=55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3 -md5=56a1919e2243cc6af59b23c06eda3783 -cksum=3597756225 upstream_url=https://pypi.io/packages/py3/u/urllib3/urllib3-VERSION-py3-none-any.whl diff --git a/build/pkgs/valgrind/checksums.ini b/build/pkgs/valgrind/checksums.ini index 086b50d177d..3ffe6ab866a 100644 --- a/build/pkgs/valgrind/checksums.ini +++ b/build/pkgs/valgrind/checksums.ini @@ -1,5 +1,3 @@ tarball=valgrind-VERSION.tar.bz2 sha1=182afd405b92ddb6f52c6729e848eacf4b1daf46 sha256=037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5 -md5=74175426afa280184b62591b58c671b3 -cksum=2472830850 diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini index 16b0e6beab2..386df56a132 100644 --- a/build/pkgs/virtualenv/checksums.ini +++ b/build/pkgs/virtualenv/checksums.ini @@ -1,6 +1,4 @@ tarball=virtualenv-VERSION-py3-none-any.whl sha1=9c942063d76d85361f0567b59cce8238c57f1183 sha256=4238949c5ffe6876362d9c0180fc6c3a824a7b12b80604eeb8085f2ed7460de3 -md5=7dec1148d91180767ae908dc49a7ebf5 -cksum=3612060825 upstream_url=https://pypi.io/packages/py3/v/virtualenv/virtualenv-VERSION-py3-none-any.whl diff --git a/build/pkgs/wcwidth/checksums.ini b/build/pkgs/wcwidth/checksums.ini index e0904082ae0..18801e12105 100644 --- a/build/pkgs/wcwidth/checksums.ini +++ b/build/pkgs/wcwidth/checksums.ini @@ -1,6 +1,4 @@ tarball=wcwidth-VERSION.tar.gz sha1=49bdbcac346f31be8201c663082331b693264382 sha256=f01c104efdf57971bcb756f054dd58ddec5204dd15fa31d6503ea57947d97c02 -md5=c37cceb9d573adcce0b3e5167ecb1df9 -cksum=68756555 upstream_url=https://pypi.io/packages/source/w/wcwidth/wcwidth-VERSION.tar.gz diff --git a/build/pkgs/webcolors/checksums.ini b/build/pkgs/webcolors/checksums.ini index 1c577f59530..2db93e1e869 100644 --- a/build/pkgs/webcolors/checksums.ini +++ b/build/pkgs/webcolors/checksums.ini @@ -1,6 +1,4 @@ tarball=webcolors-VERSION-py3-none-any.whl sha1=e13a9143964b824fc4972b60eddd8115f6839a26 sha256=29bc7e8752c0a1bd4a1f03c14d6e6a72e93d82193738fa860cbff59d0fcc11bf -md5=d9e9ac7c1da7a2b18975265cf0a953ac -cksum=371137261 upstream_url=https://pypi.io/packages/py3/w/webcolors/webcolors-VERSION-py3-none-any.whl diff --git a/build/pkgs/webencodings/checksums.ini b/build/pkgs/webencodings/checksums.ini index e8eca28026e..2f82dab8136 100644 --- a/build/pkgs/webencodings/checksums.ini +++ b/build/pkgs/webencodings/checksums.ini @@ -1,5 +1,3 @@ tarball=webencodings-VERSION.tar.gz sha1=fd870193fde74183c0e1cd43bce01a4a930cd049 sha256=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 -md5=32f6e261d52e57bf7e1c4d41546d15b8 -cksum=777885313 diff --git a/build/pkgs/websocket_client/checksums.ini b/build/pkgs/websocket_client/checksums.ini index e425fb418e0..6cc10d23812 100644 --- a/build/pkgs/websocket_client/checksums.ini +++ b/build/pkgs/websocket_client/checksums.ini @@ -1,6 +1,4 @@ tarball=websocket_client-VERSION-py3-none-any.whl sha1=eb78bd39f1ae4d531cc965bd21d121ba3d156f84 sha256=084072e0a7f5f347ef2ac3d8698a5e0b4ffbfcab607628cadabc650fc9a83a24 -md5=bea7b61d0eda66ffb9071c469d937255 -cksum=21706746 upstream_url=https://pypi.io/packages/py3/w/websocket_client/websocket_client-VERSION-py3-none-any.whl diff --git a/build/pkgs/wheel/checksums.ini b/build/pkgs/wheel/checksums.ini index 98c82b8d2fe..fcd1a77908b 100644 --- a/build/pkgs/wheel/checksums.ini +++ b/build/pkgs/wheel/checksums.ini @@ -1,6 +1,4 @@ tarball=wheel-VERSION-py3-none-any.whl sha1=fcf4ad8d5d8216d661bc98eede0d9210cbc5b697 sha256=177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d -md5=779d91395ceb12e15e3a585b30b53f9f -cksum=1421399426 upstream_url=https://pypi.io/packages/py3/w/wheel/wheel-VERSION-py3-none-any.whl diff --git a/build/pkgs/widgetsnbextension/checksums.ini b/build/pkgs/widgetsnbextension/checksums.ini index 040333d99d1..099c0acb09e 100644 --- a/build/pkgs/widgetsnbextension/checksums.ini +++ b/build/pkgs/widgetsnbextension/checksums.ini @@ -1,6 +1,4 @@ tarball=widgetsnbextension-VERSION-py3-none-any.whl sha1=067535b5d1738a4de0abb5f1219581a4a66d243c sha256=91452ca8445beb805792f206e560c1769284267a30ceb1cec9f5bcc887d15175 -md5=ac2760673371602f990bb24ac7925c5f -cksum=1509404095 upstream_url=https://pypi.io/packages/py3/w/widgetsnbextension/widgetsnbextension-VERSION-py3-none-any.whl diff --git a/build/pkgs/xz/checksums.ini b/build/pkgs/xz/checksums.ini index b227a9d751b..6e4c2226c96 100644 --- a/build/pkgs/xz/checksums.ini +++ b/build/pkgs/xz/checksums.ini @@ -1,6 +1,4 @@ tarball=xz-VERSION.tar.gz sha1=fa2ae4db119f639a01b02f99f1ba671ece2828eb sha256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 -md5=0d270c997aff29708c74d53f599ef717 -cksum=1153713708 upstream_url=https://tukaani.org/xz/xz-VERSION.tar.gz diff --git a/build/pkgs/zeromq/checksums.ini b/build/pkgs/zeromq/checksums.ini index cdabf5ad7dd..dfa643cc6e7 100644 --- a/build/pkgs/zeromq/checksums.ini +++ b/build/pkgs/zeromq/checksums.ini @@ -1,6 +1,4 @@ tarball=zeromq-VERSION.tar.gz sha1=bdbf686c8a40ba638e21cf74e34dbb425e108500 sha256=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 -md5=ae933b1e98411fd7cb8309f9502d2737 -cksum=1351453048 upstream_url=https://github.com/zeromq/libzmq/releases/download/vVERSION/zeromq-VERSION.tar.gz diff --git a/build/pkgs/zipp/checksums.ini b/build/pkgs/zipp/checksums.ini index cc86b01b70a..aef55046c00 100644 --- a/build/pkgs/zipp/checksums.ini +++ b/build/pkgs/zipp/checksums.ini @@ -1,6 +1,4 @@ tarball=zipp-VERSION-py3-none-any.whl sha1=8dd92e1b777b02ec6e1ebe72926d32a82c58b246 sha256=0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 -md5=d93f0b8485000b37800a6de09ed6c1cb -cksum=3547254189 upstream_url=https://pypi.io/packages/py3/z/zipp/zipp-VERSION-py3-none-any.whl diff --git a/build/pkgs/zlib/checksums.ini b/build/pkgs/zlib/checksums.ini index 469a7ef3c9d..5c0549d268c 100644 --- a/build/pkgs/zlib/checksums.ini +++ b/build/pkgs/zlib/checksums.ini @@ -1,5 +1,3 @@ tarball=zlib-VERSION.tar.gz sha1=e6d119755acdf9104d7ba236b1242696940ed6dd sha256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 -md5=1c9f62f0778697a09d36121ead88e08e -cksum=2150653187 diff --git a/build/sage_bootstrap/cksum.py b/build/sage_bootstrap/cksum.py deleted file mode 100644 index e507aee3941..00000000000 --- a/build/sage_bootstrap/cksum.py +++ /dev/null @@ -1,96 +0,0 @@ -""" -The unix cksum tool - -This is a weak checksum, only included for legacy reasons. -""" - -# Fun table, e.g. http://www.nco.ncep.noaa.gov/pmb/codes/nwprod/util/sorc/wgrib2.cd/grib2/wgrib2/crc32.c - -crctab = [ - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, - 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, - 0x2f8ad6d6, 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, - 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, - 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, - 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, - 0x95609039, 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, - 0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, - 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, - 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, - 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, - 0x30476dc0, 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, - 0x2e003dc5, 0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, - 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, - 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, - 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, - 0x40d816ba, 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, - 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, - 0x8e6c3698, 0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, - 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, - 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, - 0xd1799b34, 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, - 0x608edb80, 0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, - 0x774bb0eb, 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, - 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, - 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, - 0x0e56f0ff, 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, - 0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, - 0xe6ea3d65, 0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, - 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, - 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, - 0x9ff77d71, 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, - 0x81b02d74, 0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, - 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, - 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, - 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, - 0x0fdc1bec, 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, - 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, - 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, - 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, - 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, - 0x9e7d9662, 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, - 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, - 0xb1f740b4] - - -def UNSIGNED(n): - return n & 0xffffffff - - -class CksumAlgorithm(object): - - def __init__(self): - self._value = 0 - self._length = 0 - - def update(self, buffer): - value = self._value - if isinstance(buffer, str): - buffer = list(map(ord, list(buffer))) - else: - buffer = list(buffer) - for ch in buffer: - tabidx = (value >> 24) ^ ch - value = UNSIGNED((value << 8)) ^ crctab[tabidx] - self._value = value - self._length += len(buffer) - - def get_value(self): - n = self._length - value = self._value - while n: - c = n & 0o377 - n = n >> 8 - value = UNSIGNED(value << 8) ^ crctab[(value >> 24) ^ c] - return UNSIGNED(~value) - - def hexdigest(self): - return str(self.get_value()) diff --git a/build/sage_bootstrap/package.py b/build/sage_bootstrap/package.py index 6f05911340a..014b4f0d443 100644 --- a/build/sage_bootstrap/package.py +++ b/build/sage_bootstrap/package.py @@ -68,19 +68,6 @@ def name(self): """ return self.__name - @property - def md5(self): - """ - Return the MD5 checksum - - Do not use, this is ancient! Use :meth:`sha1` instead. - - OUTPUT: - - String. - """ - return self.__md5 - @property def sha1(self): """ @@ -91,7 +78,7 @@ def sha1(self): String. """ return self.__sha1 - + @property def sha256(self): """ @@ -103,19 +90,6 @@ def sha256(self): """ return self.__sha256 - @property - def cksum(self): - """ - Return the Ck sum checksum - - Do not use, this is ancient! Use :meth:`sha1` instead. - - OUTPUT: - - String. - """ - return self.__cksum - @property def tarball(self): """ @@ -487,10 +461,8 @@ def _init_checksum(self): result[var] = value except IOError: pass - self.__md5 = result.get('md5', None) self.__sha1 = result.get('sha1', None) self.__sha256 = result.get('sha256', None) - self.__cksum = result.get('cksum', None) self.__tarball_pattern = result.get('tarball', None) self.__tarball_upstream_url_pattern = result.get('upstream_url', None) # Name of the directory containing the checksums.ini file diff --git a/build/sage_bootstrap/tarball.py b/build/sage_bootstrap/tarball.py index 919c83039b7..8d50e1f9f15 100644 --- a/build/sage_bootstrap/tarball.py +++ b/build/sage_bootstrap/tarball.py @@ -121,14 +121,6 @@ def _compute_sha256(self): import hashlib return self._compute_hash(hashlib.sha256()) - def _compute_md5(self): - import hashlib - return self._compute_hash(hashlib.md5()) - - def _compute_cksum(self): - from sage_bootstrap.cksum import CksumAlgorithm - return self._compute_hash(CksumAlgorithm()) - def checksum_verifies(self): """ Test whether the checksum of the downloaded file is correct. @@ -137,7 +129,7 @@ def checksum_verifies(self): sha256 = self._compute_sha256() return sha256 == self.package.sha256 else: - log.warning('sha1 used for {pn} checksum'.format(pn=self.package.package_name)) + log.warning('sha1 used for {pn} checksum'.format(pn=self.package.name)) sha1 = self._compute_sha1() return sha1 == self.package.sha1 diff --git a/build/sage_bootstrap/updater.py b/build/sage_bootstrap/updater.py index 2debe8373b0..7631e83b9cf 100644 --- a/build/sage_bootstrap/updater.py +++ b/build/sage_bootstrap/updater.py @@ -45,9 +45,7 @@ def checksums_ini(self): result = [ 'tarball=' + self.package.tarball_pattern, 'sha1=' + tarball._compute_sha1(), - 'sha256=' + tarball._compute_sha256(), - 'md5=' + tarball._compute_md5(), - 'cksum=' + tarball._compute_cksum() + 'sha256=' + tarball._compute_sha256() ] if self.package.tarball_upstream_url_pattern: result.append('upstream_url=' + self.package.tarball_upstream_url_pattern) diff --git a/build/test/test_cksum.py b/build/test/test_cksum.py deleted file mode 100644 index e3bf0564813..00000000000 --- a/build/test/test_cksum.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- - -# **************************************************************************** -# Copyright (C) 2015 Volker Braun -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# https://www.gnu.org/licenses/ -# **************************************************************************** - - -import unittest -from sage_bootstrap.cksum import CksumAlgorithm - - -class CksumTestCase(unittest.TestCase): - - def test_cksum_bytes(self): - cksum = CksumAlgorithm() - cksum.update(b'The quick brown fox jumps over the lazy dog\n') - self.assertEqual(cksum.hexdigest(), '2382472371') - - def test_cksum_string(self): - cksum = CksumAlgorithm() - cksum.update('The quick brown fox jumps over the lazy dog\n') - self.assertEqual(cksum.hexdigest(), '2382472371') From 65f1f01d296d8a6430e45f2d01e718261a95e204 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Apr 2024 22:09:15 -0700 Subject: [PATCH 05/21] build/pkgs/symengine_py/checksums.ini: Fix upstream_url --- build/pkgs/symengine_py/checksums.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini index 8706f117424..40c3c10bba8 100644 --- a/build/pkgs/symengine_py/checksums.ini +++ b/build/pkgs/symengine_py/checksums.ini @@ -1,4 +1,5 @@ tarball=symengine.py-VERSION.tar.gz -sha1=e461d072a6ba8f0082d6f187eba7f053343529c6 -sha256=8351c0267c2cd7866ff04c04261f06cd75af9a7130aac848ca43fd047404e229 -upstream_url=https://pypi.io/packages/source/p/symengine/symengine-VERSION.tar.gz +sha1=4a8da0d0a057c8709c5b28543dbb3d26a060f013 +md5=d10f4ba5c27b09ef234fcafddf824ce5 +cksum=1332096394 +upstream_url=https://pypi.io/packages/source/s/symengine/symengine-VERSION.tar.gz From 685b4dc51c4240b8afd2d383df34913dcadb0b94 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 18 Apr 2024 23:30:05 -0700 Subject: [PATCH 06/21] sage_bootstrap.tarball: After checking sha256, also check sha1 for consistency --- build/sage_bootstrap/tarball.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/sage_bootstrap/tarball.py b/build/sage_bootstrap/tarball.py index 8d50e1f9f15..461c76c83cf 100644 --- a/build/sage_bootstrap/tarball.py +++ b/build/sage_bootstrap/tarball.py @@ -116,7 +116,7 @@ def _compute_hash(self, algorithm): def _compute_sha1(self): import hashlib return self._compute_hash(hashlib.sha1()) - + def _compute_sha256(self): import hashlib return self._compute_hash(hashlib.sha256()) @@ -127,11 +127,12 @@ def checksum_verifies(self): """ if self.package.sha256: sha256 = self._compute_sha256() - return sha256 == self.package.sha256 + if sha256 != self.package.sha256: + return False else: - log.warning('sha1 used for {pn} checksum'.format(pn=self.package.name)) - sha1 = self._compute_sha1() - return sha1 == self.package.sha1 + log.warning('sha1 used for {0} checksum'.format(self.package.name)) + sha1 = self._compute_sha1() + return sha1 == self.package.sha1 def is_distributable(self): return 'do-not-distribute' not in self.filename From d75ca34e7088879925fe6de38eb6135fb200c192 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 18 Apr 2024 23:36:44 -0700 Subject: [PATCH 07/21] sage -package fix-checksum: If sha256 is not available, create it --- build/sage_bootstrap/app.py | 2 +- build/sage_bootstrap/tarball.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/sage_bootstrap/app.py b/build/sage_bootstrap/app.py index 96bca3a6d8c..44d62c2cca1 100644 --- a/build/sage_bootstrap/app.py +++ b/build/sage_bootstrap/app.py @@ -373,7 +373,7 @@ def fix_checksum(self, package_name): if not os.path.exists(pkg.tarball.upstream_fqn): log.info('Ignoring {0} because tarball is not cached'.format(package_name)) return - if pkg.tarball.checksum_verifies(): + if pkg.tarball.checksum_verifies(force_sha256=True): log.info('Checksum of {0} (tarball {1}) unchanged'.format(package_name, pkg.tarball_filename)) else: log.info('Updating checksum of {0} (tarball {1})'.format(package_name, pkg.tarball_filename)) diff --git a/build/sage_bootstrap/tarball.py b/build/sage_bootstrap/tarball.py index 461c76c83cf..07bdff45dd5 100644 --- a/build/sage_bootstrap/tarball.py +++ b/build/sage_bootstrap/tarball.py @@ -121,7 +121,7 @@ def _compute_sha256(self): import hashlib return self._compute_hash(hashlib.sha256()) - def checksum_verifies(self): + def checksum_verifies(self, force_sha256=False): """ Test whether the checksum of the downloaded file is correct. """ @@ -129,8 +129,11 @@ def checksum_verifies(self): sha256 = self._compute_sha256() if sha256 != self.package.sha256: return False + elif force_sha256: + log.warning('sha256 not available for {0}'.format(self.package.name)) + return False else: - log.warning('sha1 used for {0} checksum'.format(self.package.name)) + log.warning('sha256 not available for {0}, using sha1'.format(self.package.name)) sha1 = self._compute_sha1() return sha1 == self.package.sha1 From 626539b02a0a752e65c48d24323b53be71b8c180 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 18 Apr 2024 23:40:06 -0700 Subject: [PATCH 08/21] Update checksums.ini for updated packages --- build/pkgs/cypari/checksums.ini | 3 +-- build/pkgs/jupyter_sphinx/checksums.ini | 3 +-- build/pkgs/memory_allocator/checksums.ini | 3 +-- build/pkgs/msolve/checksums.ini | 3 +-- build/pkgs/python_flint/checksums.ini | 3 +-- build/pkgs/pythran/checksums.ini | 3 +-- build/pkgs/scipy/checksums.ini | 3 +-- build/pkgs/symengine_py/checksums.ini | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/build/pkgs/cypari/checksums.ini b/build/pkgs/cypari/checksums.ini index 27a680da968..8bedd4cf52d 100644 --- a/build/pkgs/cypari/checksums.ini +++ b/build/pkgs/cypari/checksums.ini @@ -1,5 +1,4 @@ tarball=cypari2-VERSION.tar.gz sha1=4cb5fc43899852b7fc0c0175e610318c38f0caac -md5=e9940034c6707a3faeb416f207444e81 -cksum=361739172 +sha256=1a25865c34f20b1dc95830798e34ab6436e278b8e0c80dc7bf0ab34c5db03ab8 upstream_url=https://pypi.io/packages/source/c/cypari2/cypari2-VERSION.tar.gz diff --git a/build/pkgs/jupyter_sphinx/checksums.ini b/build/pkgs/jupyter_sphinx/checksums.ini index a61d047a41d..fc843987136 100644 --- a/build/pkgs/jupyter_sphinx/checksums.ini +++ b/build/pkgs/jupyter_sphinx/checksums.ini @@ -1,5 +1,4 @@ tarball=jupyter_sphinx-VERSION.tar.gz sha1=85e6e1665488fac3131da2e3ab9648037c0d1da9 -md5=397d3b20c8df015bf6a1e50d0208590d -cksum=524174657 +sha256=2e23699a3a1cf5db31b10981da5aa32606ee730f6b73a844d1e76d800756af56 upstream_url=https://pypi.io/packages/source/j/jupyter_sphinx/jupyter_sphinx-VERSION.tar.gz diff --git a/build/pkgs/memory_allocator/checksums.ini b/build/pkgs/memory_allocator/checksums.ini index 76e62a79758..9aaa169c6dd 100644 --- a/build/pkgs/memory_allocator/checksums.ini +++ b/build/pkgs/memory_allocator/checksums.ini @@ -1,5 +1,4 @@ tarball=memory_allocator-VERSION.tar.gz sha1=21661580dd3f41aac0f2090033d8804e6ff495d9 -md5=2a5e087c686b04996ccb88ce56cad9f0 -cksum=3481909016 +sha256=d609216b03031967e2b45a804b12ff9029578f4ec019fde42cf6aed6ca09efe4 upstream_url=https://pypi.io/packages/source/m/memory_allocator/memory_allocator-VERSION.tar.gz diff --git a/build/pkgs/msolve/checksums.ini b/build/pkgs/msolve/checksums.ini index 5b8cb2b9a6e..9ce7c826190 100644 --- a/build/pkgs/msolve/checksums.ini +++ b/build/pkgs/msolve/checksums.ini @@ -1,5 +1,4 @@ tarball=msolve-VERSION.tar.gz sha1=01b7c4b7b6a7df5051c1357e69d9b1fd381d2907 -md5=b45cdaa5a0e588a5382660ce1c245e65 -cksum=3873680457 +sha256=1f7cd8207836f522cbbc96f3bfbe431f794a31562be2c04ae1df981557c5d145 upstream_url=https://msolve.lip6.fr/downloads/vVERSION/msolve-VERSION.tar.gz diff --git a/build/pkgs/python_flint/checksums.ini b/build/pkgs/python_flint/checksums.ini index 265d92659e1..19d40c1c7b1 100644 --- a/build/pkgs/python_flint/checksums.ini +++ b/build/pkgs/python_flint/checksums.ini @@ -1,5 +1,4 @@ tarball=python-flint-VERSION.tar.gz sha1=c7d5b3b8db47c903eea9e752bd7732e34d6c5945 -md5=6473f4da8959f0ec085db62bca3e40e3 -cksum=2814579556 +sha256=f829e00774534891b38de41bc511cf6c7d6d216544a6a84b92d9e1f159de0878 upstream_url=https://pypi.io/packages/source/p/python_flint/python-flint-VERSION.tar.gz diff --git a/build/pkgs/pythran/checksums.ini b/build/pkgs/pythran/checksums.ini index 5e9aebabe99..03d21286397 100644 --- a/build/pkgs/pythran/checksums.ini +++ b/build/pkgs/pythran/checksums.ini @@ -1,5 +1,4 @@ tarball=pythran-VERSION.tar.gz sha1=dc8a6035c0c46d36630085003160a3aba4444add -md5=cc6fa05e583733182d06d2e41e03cc10 -cksum=3823048752 +sha256=f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c upstream_url=https://pypi.io/packages/source/p/pythran/pythran-VERSION.tar.gz diff --git a/build/pkgs/scipy/checksums.ini b/build/pkgs/scipy/checksums.ini index 762809ffd08..8871f77250b 100644 --- a/build/pkgs/scipy/checksums.ini +++ b/build/pkgs/scipy/checksums.ini @@ -1,5 +1,4 @@ tarball=scipy-VERSION.tar.gz sha1=0fd6e14972d8dd9b4a656686a40aed00ad0f1396 -md5=22683fcf9a411f0a5254b7509bea0a6b -cksum=1907765013 +sha256=4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3 upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini index 40c3c10bba8..b8984f6553c 100644 --- a/build/pkgs/symengine_py/checksums.ini +++ b/build/pkgs/symengine_py/checksums.ini @@ -1,5 +1,4 @@ tarball=symengine.py-VERSION.tar.gz sha1=4a8da0d0a057c8709c5b28543dbb3d26a060f013 -md5=d10f4ba5c27b09ef234fcafddf824ce5 -cksum=1332096394 +sha256=0dd30d29b804ebb7251bddec29c38c3b1fc15ea6953a2c57ee758d5f6fcba458 upstream_url=https://pypi.io/packages/source/s/symengine/symengine-VERSION.tar.gz From a3ccd8d01a8e4cc8991c7edd390e6925f6302340 Mon Sep 17 00:00:00 2001 From: faisal <71896424+faisalfakhro@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:58:15 +0300 Subject: [PATCH 09/21] update packages checksums.ini --- build/pkgs/onetbb/checksums.ini | 3 +-- build/pkgs/papilo/checksums.ini | 3 +-- build/pkgs/pyscipopt/checksums.ini | 3 +-- build/pkgs/scip/checksums.ini | 3 +-- build/pkgs/scip_sdp/checksums.ini | 3 +-- build/pkgs/soplex/checksums.ini | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/build/pkgs/onetbb/checksums.ini b/build/pkgs/onetbb/checksums.ini index 42e837760b6..6573c2f7b99 100644 --- a/build/pkgs/onetbb/checksums.ini +++ b/build/pkgs/onetbb/checksums.ini @@ -1,5 +1,4 @@ tarball=onetbb-VERSION.tar.gz sha1=740e86b703f42446ddde392b73a9db3dc0f5f4cd -md5=b301151120b08a17e98dcdda6e4f6011 -cksum=3287903962 +sha256=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363 upstream_url=https://github.com/oneapi-src/oneTBB/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/papilo/checksums.ini b/build/pkgs/papilo/checksums.ini index 8bebc605f2c..831334dbdb9 100644 --- a/build/pkgs/papilo/checksums.ini +++ b/build/pkgs/papilo/checksums.ini @@ -1,5 +1,4 @@ tarball=papilo-VERSION.tar.gz sha1=069f64ff25cfb08c9b2a416d1d215bd5b907c877 -md5=d58b7c991ac1c4a863de92a404409ca8 -cksum=1552180280 +sha256=4ed759e55fe1c74be779137e4e3cdae67e1b64bd62ca31793ca3b321509c27a8 upstream_url=https://github.com/scipopt/papilo/archive/refs/tags/vVERSION.tar.gz diff --git a/build/pkgs/pyscipopt/checksums.ini b/build/pkgs/pyscipopt/checksums.ini index 1232c25dff5..a88c5cf04d8 100644 --- a/build/pkgs/pyscipopt/checksums.ini +++ b/build/pkgs/pyscipopt/checksums.ini @@ -1,5 +1,4 @@ tarball=PySCIPOpt-VERSION.tar.gz sha1=713e32cc0ff112500c4f43487614094ece4a8bbf -md5=ee425a362744a4475228510b48781be9 -cksum=1541742154 +sha256=f9c36c941e1373406b00c030f2511578c3fb02a95a2cf5559772deb846a0af47 upstream_url=https://pypi.io/packages/source/p/pyscipopt/PySCIPOpt-VERSION.tar.gz diff --git a/build/pkgs/scip/checksums.ini b/build/pkgs/scip/checksums.ini index 9dce3926f9b..d99a2b7930f 100644 --- a/build/pkgs/scip/checksums.ini +++ b/build/pkgs/scip/checksums.ini @@ -1,5 +1,4 @@ tarball=scip-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.tar.gz sha1=bb28aef4bad00a1ff2c7f4ee982961709d15b9f8 -md5=2fdbc40c98d380b12586bcef6819b9d7 -cksum=1262698285 +sha256=ee221bd13a6b24738f2e74321e2efdebd6d7c603574ca6f6cb9d4472ead2c22f upstream_url=https://github.com/scipopt/scip/archive/refs/tags/v${VERSION_MAJOR}${VERSION_MINOR}${VERSION_MICRO}.tar.gz diff --git a/build/pkgs/scip_sdp/checksums.ini b/build/pkgs/scip_sdp/checksums.ini index 94370bcab39..33aa56647eb 100644 --- a/build/pkgs/scip_sdp/checksums.ini +++ b/build/pkgs/scip_sdp/checksums.ini @@ -1,5 +1,4 @@ tarball=scipsdp-VERSION.tgz sha1=d5482fd414fdcaa38d6d80111bbe8931aeef63ea -md5=0de7752ba6602e3432940eaaf79dfa9d -cksum=162799809 +sha256=6c8fbc15fc87bf4e12e0cafa4d1887933843447982d5ac3e8eb5e745d80b6d1a upstream_url=http://www.opt.tu-darmstadt.de/scipsdp/downloads/scipsdp-VERSION.tgz diff --git a/build/pkgs/soplex/checksums.ini b/build/pkgs/soplex/checksums.ini index 866f76b3ba9..4eb6d430aff 100644 --- a/build/pkgs/soplex/checksums.ini +++ b/build/pkgs/soplex/checksums.ini @@ -1,5 +1,4 @@ tarball=soplex-VERSION.tar.gz sha1=5d0e7fa41b45aa0877134a5b8e261d9608505636 -md5=28be7e9aa5579ccd62cbe492d874ca2a -cksum=232471152 +sha256=ab1906d3afb1793a6f129a5baef9dd8eee929ee945aade427cb9f0b17888239c upstream_url=https://github.com/scipopt/soplex/archive/refs/tags/release-${VERSION_MAJOR}${VERSION_MINOR}${VERSION_MICRO}.tar.gz From 4044324ba44b6188d54ffc6d117081d9be4be034 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 28 Apr 2024 13:05:31 -0700 Subject: [PATCH 10/21] sage -package fix-checksum :all: --- build/pkgs/hatch_fancy_pypi_readme/checksums.ini | 3 +-- build/pkgs/hatchling/checksums.ini | 3 +-- build/pkgs/pip/checksums.ini | 3 +-- build/pkgs/platformdirs/checksums.ini | 3 +-- build/pkgs/pyproject_hooks/checksums.ini | 3 +-- build/pkgs/python_build/checksums.ini | 3 +-- build/pkgs/setuptools/checksums.ini | 3 +-- build/pkgs/trove_classifiers/checksums.ini | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini index 067609dd4fc..c624067269f 100644 --- a/build/pkgs/hatch_fancy_pypi_readme/checksums.ini +++ b/build/pkgs/hatch_fancy_pypi_readme/checksums.ini @@ -1,5 +1,4 @@ tarball=hatch_fancy_pypi_readme-VERSION-py3-none-any.whl sha1=25cd6749c20a6803cbf1b6c4d29338c344a8f09c -md5=a38ee7191a80ebdbbf0f126f7dff7e46 -cksum=1509914432 +sha256=26ec5c7cfd9f604eff0ae6c927d7b197b220706dca203f0aad1928abc81f3a46 upstream_url=https://pypi.io/packages/py3/h/hatch_fancy_pypi_readme/hatch_fancy_pypi_readme-VERSION-py3-none-any.whl diff --git a/build/pkgs/hatchling/checksums.ini b/build/pkgs/hatchling/checksums.ini index 1d5f9b819ce..ce647e83c52 100644 --- a/build/pkgs/hatchling/checksums.ini +++ b/build/pkgs/hatchling/checksums.ini @@ -1,5 +1,4 @@ tarball=hatchling-VERSION-py3-none-any.whl sha1=2212af13a26dbaea72c7a4ecbdb950c05f6e7c00 -md5=0301aa5bc8739e9f4d58e29d285fb2f7 -cksum=1232194081 +sha256=30ec7ee09f6e17b73257eedfd7f5bb5a9b028a6cf6d144d9faad1d826fa203b8 upstream_url=https://pypi.io/packages/py3/h/hatchling/hatchling-VERSION-py3-none-any.whl diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini index ebfbc1a26a1..62ecf000278 100644 --- a/build/pkgs/pip/checksums.ini +++ b/build/pkgs/pip/checksums.ini @@ -1,5 +1,4 @@ tarball=pip-VERSION-py3-none-any.whl sha1=e44313ae1e6af3c2bd3b60ab2fa8c34308d00555 -md5=74e3c5e4082113b1239ca0e9abfd1e82 -cksum=88131429 +sha256=ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc upstream_url=https://pypi.io/packages/py3/p/pip/pip-VERSION-py3-none-any.whl diff --git a/build/pkgs/platformdirs/checksums.ini b/build/pkgs/platformdirs/checksums.ini index f8770e91289..28576a25b7f 100644 --- a/build/pkgs/platformdirs/checksums.ini +++ b/build/pkgs/platformdirs/checksums.ini @@ -1,5 +1,4 @@ tarball=platformdirs-VERSION-py3-none-any.whl sha1=487a4610a037c90b242aafbe1e3f8b6ebb3ba1c8 -md5=99200c4e22d44a64a9c3ad0c72a317af -cksum=1011122610 +sha256=0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 upstream_url=https://pypi.io/packages/py3/p/platformdirs/platformdirs-VERSION-py3-none-any.whl diff --git a/build/pkgs/pyproject_hooks/checksums.ini b/build/pkgs/pyproject_hooks/checksums.ini index f35e59aa59f..4688d10283b 100644 --- a/build/pkgs/pyproject_hooks/checksums.ini +++ b/build/pkgs/pyproject_hooks/checksums.ini @@ -1,5 +1,4 @@ tarball=pyproject_hooks-VERSION-py3-none-any.whl sha1=6c99163c52786fb97eac8b4e38cc13fa3af141a9 -md5=68020c2619c7a744dcee12b670c9f413 -cksum=3405759428 +sha256=283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8 upstream_url=https://pypi.io/packages/py3/p/pyproject_hooks/pyproject_hooks-VERSION-py3-none-any.whl diff --git a/build/pkgs/python_build/checksums.ini b/build/pkgs/python_build/checksums.ini index df10f8d3196..c2bafe9d49d 100644 --- a/build/pkgs/python_build/checksums.ini +++ b/build/pkgs/python_build/checksums.ini @@ -1,5 +1,4 @@ tarball=build-VERSION-py3-none-any.whl sha1=950bf228726af5041adbe2bb04a7ca74e27bce60 -md5=6f34942a01c3307b42556ee7628f3d1d -cksum=4005002353 +sha256=75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4 upstream_url=https://pypi.io/packages/py3/b/build/build-VERSION-py3-none-any.whl diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index bcd55128882..2436821630d 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,5 +1,4 @@ tarball=setuptools-VERSION-py3-none-any.whl sha1=49841be6743b2d129d01d02d5fd339dd693c99dc -md5=1555b24e28b53f3342e557500dedf8f3 -cksum=3445997019 +sha256=c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32 upstream_url=https://pypi.io/packages/py3/s/setuptools/setuptools-VERSION-py3-none-any.whl diff --git a/build/pkgs/trove_classifiers/checksums.ini b/build/pkgs/trove_classifiers/checksums.ini index 8bd0eca4933..8d25c121cc2 100644 --- a/build/pkgs/trove_classifiers/checksums.ini +++ b/build/pkgs/trove_classifiers/checksums.ini @@ -1,5 +1,4 @@ tarball=trove_classifiers-VERSION-py3-none-any.whl sha1=36240d053d16400380aee01f0879785693008a96 -md5=02b3e7b2eb81c3656fa859a87482f120 -cksum=1500381935 +sha256=678bd6fcc5218d72e3304e27a608acc9b91e17bd00c3f3d8c968497c843ad98b upstream_url=https://pypi.io/packages/py3/t/trove_classifiers/trove_classifiers-VERSION-py3-none-any.whl From d831891af8330b16c66183a68082760f588180f4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 2 May 2024 16:08:35 -0700 Subject: [PATCH 11/21] build/pkgs/{editables,fricas}: Add sha256 --- build/pkgs/editables/checksums.ini | 3 +-- build/pkgs/fricas/checksums.ini | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/pkgs/editables/checksums.ini b/build/pkgs/editables/checksums.ini index a3628c1c005..6470e5fd5d2 100644 --- a/build/pkgs/editables/checksums.ini +++ b/build/pkgs/editables/checksums.ini @@ -1,5 +1,4 @@ tarball=editables-VERSION-py3-none-any.whl sha1=7aa90de86b05d6dc1a04c219b01ca7eab09de113 -md5=5de129d3a039b26b7f6798a4002acdf6 -cksum=24000838 +sha256=61e5ffa82629e0d8bfe09bc44a07db3c1ab8ed1ce78a6980732870f19b5e7d4c upstream_url=https://pypi.io/packages/py3/e/editables/editables-VERSION-py3-none-any.whl diff --git a/build/pkgs/fricas/checksums.ini b/build/pkgs/fricas/checksums.ini index a06136db04e..1790c649eb3 100644 --- a/build/pkgs/fricas/checksums.ini +++ b/build/pkgs/fricas/checksums.ini @@ -1,5 +1,4 @@ tarball=fricas-VERSION-full.tar.bz2 sha1=2f1e1bbbad7e04a7114ffbd93eeedadc5db32272 -md5=d2ecd6f8c45cfc41c407b7d5f6eaae07 -cksum=1256005675 +sha256=fc2112ad45ba7b45ac423165f32bd5b244622107a1e4e1d56b9136f96746f2a0 upstream_url=https://github.com/fricas/fricas/releases/download/VERSION/fricas-VERSION-full.tar.bz2 From 72b755a57fe23ffe9b471cf38c4510cebbb687ea Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 4 May 2024 18:09:12 -0700 Subject: [PATCH 12/21] build/pkgs/{gc,singular}: Add sha256 --- build/pkgs/gc/checksums.ini | 3 +-- build/pkgs/singular/checksums.ini | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/pkgs/gc/checksums.ini b/build/pkgs/gc/checksums.ini index 81825b73703..ede35b376a2 100644 --- a/build/pkgs/gc/checksums.ini +++ b/build/pkgs/gc/checksums.ini @@ -1,5 +1,4 @@ tarball=gc-VERSION.tar.gz sha1=3f543532c47e592a8f5ea6f7a529c8ed7465a5c7 -md5=fc5351214bc2e854070ee3319181a467 -cksum=2567761321 +sha256=b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc upstream_url=https://github.com/ivmai/bdwgc/releases/download/vVERSION/gc-VERSION.tar.gz diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini index 3273f5f7055..69cc9aae6e3 100644 --- a/build/pkgs/singular/checksums.ini +++ b/build/pkgs/singular/checksums.ini @@ -1,5 +1,4 @@ tarball=singular-VERSION.tar.gz sha1=1f678e1cc756fd8dc29dcdef5ae67441b6bcc779 -md5=09382cdacbfe67b4099056b65c2ec016 -cksum=244065751 +sha256=c269abbd24c84fe33edc0af1e78b8fec53d8e94338410ac06c2666cfd40d43f2 upstream_url=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${VERSION_MAJOR}-${VERSION_MINOR}-${VERSION_MICRO}/singular-VERSION.tar.gz From 8b0768a2b3863fddb36533722748ee550013f47c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 4 May 2024 18:13:13 -0700 Subject: [PATCH 13/21] build/pkgs/python3: Add sha256 --- build/pkgs/python3/checksums.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/pkgs/python3/checksums.ini b/build/pkgs/python3/checksums.ini index 936ac821ed2..f0f0ce6eb75 100644 --- a/build/pkgs/python3/checksums.ini +++ b/build/pkgs/python3/checksums.ini @@ -1,5 +1,4 @@ tarball=Python-VERSION.tar.xz sha1=a368aeed7a3325e47b55168452c356a8eb27ab50 -md5=b353b8433e560e1af2b130f56dfbd973 -cksum=534846730 +sha256=9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz From eb08315359f5613445d288b776e1b391cabbcaf4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 12 May 2024 13:33:49 -0700 Subject: [PATCH 14/21] sage -package fix-checksum :all: --- build/pkgs/configure/checksums.ini | 3 +-- build/pkgs/cython/checksums.ini | 3 +-- build/pkgs/fflas_ffpack/checksums.ini | 5 ++--- build/pkgs/givaro/checksums.ini | 5 ++--- build/pkgs/linbox/checksums.ini | 5 ++--- build/pkgs/packaging/checksums.ini | 3 +-- build/pkgs/wheel/checksums.ini | 3 +-- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 3222e604fa8..e4bbf930fe7 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,3 @@ tarball=configure-VERSION.tar.gz sha1=dca19f73642b76f1f96b860bb6603499f586380d -md5=cdfc81ecaa40045a7827959e9f52e226 -cksum=1337053183 +sha256=843e060687a9a2360ea3e9499e5c20eb744fcfc2acd4b13c01444ecd961fd43e diff --git a/build/pkgs/cython/checksums.ini b/build/pkgs/cython/checksums.ini index 6fcab0bf060..9393fe60b7f 100644 --- a/build/pkgs/cython/checksums.ini +++ b/build/pkgs/cython/checksums.ini @@ -1,5 +1,4 @@ tarball=Cython-VERSION.tar.gz sha1=83d6428e3bb7869f44f92ed75d7dff867c2a38ce -md5=0110d7adac5ebb6ae65d8b71a72b664e -cksum=1043698601 +sha256=dcc96739331fb854dcf503f94607576cfe8488066c61ca50dfd55836f132de99 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz diff --git a/build/pkgs/fflas_ffpack/checksums.ini b/build/pkgs/fflas_ffpack/checksums.ini index 1a5cdcee74b..8b778d5569f 100644 --- a/build/pkgs/fflas_ffpack/checksums.ini +++ b/build/pkgs/fflas_ffpack/checksums.ini @@ -1,5 +1,4 @@ tarball=fflas_ffpack-VERSION.tar.bz2 sha1=7c5faa81abc2b88ec24cec373b5e44cbaa7844dd -md5=d8b7c113951a2a3f498a3aaadbe5620f -cksum=3321469120 -upstream_url=https://github.com/linbox-team/fflas-ffpack/releases/download/vVERSION/fflas_ffpack-VERSION.tar.bz2 \ No newline at end of file +sha256=80cddc18212e00beba0fcd64b7bdf64e56010438e23c10968c9f526a6d88fec3 +upstream_url=https://github.com/linbox-team/fflas-ffpack/releases/download/vVERSION/fflas_ffpack-VERSION.tar.bz2 diff --git a/build/pkgs/givaro/checksums.ini b/build/pkgs/givaro/checksums.ini index 8d20cfdafa5..6306205226a 100644 --- a/build/pkgs/givaro/checksums.ini +++ b/build/pkgs/givaro/checksums.ini @@ -1,5 +1,4 @@ tarball=givaro-VERSION.tar.gz sha1=73ef15ca34c6f1c9f61013d2bd7d4d547e3ace14 -md5=d03ca4ba1e4a44c20935cf2adfcb520b -cksum=3088182773 -upstream_url=https://github.com/linbox-team/givaro/releases/download/vVERSION/givaro-VERSION.tar.gz \ No newline at end of file +sha256=865e228812feca971dfb6e776a7bc7ac959cf63ebd52b4f05492730a46e1f189 +upstream_url=https://github.com/linbox-team/givaro/releases/download/vVERSION/givaro-VERSION.tar.gz diff --git a/build/pkgs/linbox/checksums.ini b/build/pkgs/linbox/checksums.ini index 397bf97190f..479e4f40480 100644 --- a/build/pkgs/linbox/checksums.ini +++ b/build/pkgs/linbox/checksums.ini @@ -1,5 +1,4 @@ tarball=linbox-VERSION.tar.gz sha1=24e8bdbd16fe3dedce0dd343398999a4aed7c02c -md5=1e1b95f12f015815a0194eac0cb611d0 -cksum=253115750 -upstream_url=https://github.com/linbox-team/linbox/releases/download/vVERSION/linbox-VERSION.tar.gz \ No newline at end of file +sha256=6d2159fd395be0298362dd37f6c696676237bc8e2757341fbc46520e3b466bcc +upstream_url=https://github.com/linbox-team/linbox/releases/download/vVERSION/linbox-VERSION.tar.gz diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini index 69a230aa11c..4b1b2974bde 100644 --- a/build/pkgs/packaging/checksums.ini +++ b/build/pkgs/packaging/checksums.ini @@ -1,5 +1,4 @@ tarball=packaging-VERSION-py3-none-any.whl sha1=21573cef174a05ac2794b34f3841d6f9ea9fa507 -md5=8b7ed65f4b1a2175ccab25317f2efccc -cksum=4283692602 +sha256=2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 upstream_url=https://pypi.io/packages/py3/p/packaging/packaging-VERSION-py3-none-any.whl diff --git a/build/pkgs/wheel/checksums.ini b/build/pkgs/wheel/checksums.ini index 6e28451ce44..ea4d40c1f27 100644 --- a/build/pkgs/wheel/checksums.ini +++ b/build/pkgs/wheel/checksums.ini @@ -1,5 +1,4 @@ tarball=wheel-VERSION-py3-none-any.whl sha1=71a83a2237cb57ab45bdafed364564e36ca5dc95 -md5=e65b1197e1dfc6bbc8df362935f5943d -cksum=1664872683 +sha256=55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81 upstream_url=https://pypi.io/packages/py3/w/wheel/wheel-VERSION-py3-none-any.whl From 427f8d0c43ef7a604cefd8474fc0ad50a15a3313 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 May 2024 13:54:14 -0700 Subject: [PATCH 15/21] build/pkgs/gcc: Update to 13.2.0 --- build/pkgs/gcc/checksums.ini | 6 +++--- build/pkgs/gcc/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/gcc/checksums.ini b/build/pkgs/gcc/checksums.ini index 996f8360f45..6e37efd475a 100644 --- a/build/pkgs/gcc/checksums.ini +++ b/build/pkgs/gcc/checksums.ini @@ -1,5 +1,5 @@ tarball=gcc-VERSION.tar.xz -sha1=5dce6dc0091b8049b530d1587513a07201691760 -md5=73bafd0af874439dcdb9fc063b6fb069 -cksum=2807184004 +sha1=5f95b6d042fb37d45c6cbebfc91decfbc4fb493c +md5=e0e48554cc6e4f261d55ddee9ab69075 +cksum=1931627455 upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz diff --git a/build/pkgs/gcc/package-version.txt b/build/pkgs/gcc/package-version.txt index 685332623b2..67aee23940e 100644 --- a/build/pkgs/gcc/package-version.txt +++ b/build/pkgs/gcc/package-version.txt @@ -1 +1 @@ -12.2.0 +13.2.0 From 33f30a995ae759b34504d15575f51868ea68cd3c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 May 2024 16:04:34 -0700 Subject: [PATCH 16/21] build/pkgs/gcc/patches: Add from https://github.com/Homebrew/homebrew-core/blob/50d9d78a4a09b42807b0a8f74f1f2f8933051a7b/Formula/g/gcc@13.rb --- ...7560ff1fc0fb2df38c2f9627a20c9a8da5c5.patch | 138 + ...b9e60ce1d9aa7751d79291133fd5af9209d7.patch | 64 + build/pkgs/gcc/patches/gcc-13-homebrew.patch | 71 + ...-12.2.0-arm.patch => gcc-13.2.0-arm.patch} | 12547 ++++++---------- .../gcc/patches/gcc-xcode15-warnings.patch | 25 + 5 files changed, 5243 insertions(+), 7602 deletions(-) create mode 100644 build/pkgs/gcc/patches/68057560ff1fc0fb2df38c2f9627a20c9a8da5c5.patch create mode 100644 build/pkgs/gcc/patches/e95ab9e60ce1d9aa7751d79291133fd5af9209d7.patch create mode 100644 build/pkgs/gcc/patches/gcc-13-homebrew.patch rename build/pkgs/gcc/patches/{gcc-12.2.0-arm.patch => gcc-13.2.0-arm.patch} (52%) create mode 100644 build/pkgs/gcc/patches/gcc-xcode15-warnings.patch diff --git a/build/pkgs/gcc/patches/68057560ff1fc0fb2df38c2f9627a20c9a8da5c5.patch b/build/pkgs/gcc/patches/68057560ff1fc0fb2df38c2f9627a20c9a8da5c5.patch new file mode 100644 index 00000000000..0672eb2936e --- /dev/null +++ b/build/pkgs/gcc/patches/68057560ff1fc0fb2df38c2f9627a20c9a8da5c5.patch @@ -0,0 +1,138 @@ +From: Francois-Xavier Coudert +Date: Thu, 7 Mar 2024 13:36:03 +0000 (+0100) +Subject: Include safe-ctype.h after C++ standard headers, to avoid over-poisoning +X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=68057560ff1fc0fb2df38c2f9627a20c9a8da5c5 + +Include safe-ctype.h after C++ standard headers, to avoid over-poisoning + +When building gcc's C++ sources against recent libc++, the poisoning of +the ctype macros due to including safe-ctype.h before including C++ +standard headers such as , , etc, causes many compilation +errors, similar to: + + In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23: + In file included from /home/dim/src/gcc/master/gcc/system.h:233: + In file included from /usr/include/c++/v1/vector:321: + In file included from + /usr/include/c++/v1/__format/formatter_bool.h:20: + In file included from + /usr/include/c++/v1/__format/formatter_integral.h:32: + In file included from /usr/include/c++/v1/locale:202: + /usr/include/c++/v1/__locale:546:5: error: '__abi_tag__' attribute + only applies to structs, variables, functions, and namespaces + 546 | _LIBCPP_INLINE_VISIBILITY + | ^ + /usr/include/c++/v1/__config:813:37: note: expanded from macro + '_LIBCPP_INLINE_VISIBILITY' + 813 | # define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI + | ^ + /usr/include/c++/v1/__config:792:26: note: expanded from macro + '_LIBCPP_HIDE_FROM_ABI' + 792 | + __attribute__((__abi_tag__(_LIBCPP_TOSTRING( + _LIBCPP_VERSIONED_IDENTIFIER)))) + | ^ + In file included from /home/dim/src/gcc/master/gcc/gensupport.cc:23: + In file included from /home/dim/src/gcc/master/gcc/system.h:233: + In file included from /usr/include/c++/v1/vector:321: + In file included from + /usr/include/c++/v1/__format/formatter_bool.h:20: + In file included from + /usr/include/c++/v1/__format/formatter_integral.h:32: + In file included from /usr/include/c++/v1/locale:202: + /usr/include/c++/v1/__locale:547:37: error: expected ';' at end of + declaration list + 547 | char_type toupper(char_type __c) const + | ^ + /usr/include/c++/v1/__locale:553:48: error: too many arguments + provided to function-like macro invocation + 553 | const char_type* toupper(char_type* __low, const + char_type* __high) const + | ^ + /home/dim/src/gcc/master/gcc/../include/safe-ctype.h:146:9: note: + macro 'toupper' defined here + 146 | #define toupper(c) do_not_use_toupper_with_safe_ctype + | ^ + +This is because libc++ uses different transitive includes than +libstdc++, and some of those transitive includes pull in various ctype +declarations (typically via ). + +There was already a special case for including before +safe-ctype.h, so move the rest of the C++ standard header includes to +the same location, to fix the problem. + + PR middle-end/111632 + +gcc/ChangeLog: + + * system.h: Include safe-ctype.h after C++ standard headers. + +Signed-off-by: Dimitry Andric +(cherry picked from commit 9970b576b7e4ae337af1268395ff221348c4b34a) +--- + +diff --git a/gcc/system.h b/gcc/system.h +index 33e9d4211150..03ab33ac960f 100644 +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -194,27 +194,8 @@ extern int fprintf_unlocked (FILE *, const char *, ...); + #undef fread_unlocked + #undef fwrite_unlocked + +-/* Include before "safe-ctype.h" to avoid GCC poisoning +- the ctype macros through safe-ctype.h */ +- +-#ifdef __cplusplus +-#ifdef INCLUDE_STRING +-# include +-#endif +-#endif +- +-/* There are an extraordinary number of issues with . +- The last straw is that it varies with the locale. Use libiberty's +- replacement instead. */ +-#include "safe-ctype.h" +- +-#include +- +-#include +- +-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO +-extern int errno; +-#endif ++/* Include C++ standard headers before "safe-ctype.h" to avoid GCC ++ poisoning the ctype macros through safe-ctype.h */ + + #ifdef __cplusplus + #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) +@@ -229,6 +210,9 @@ extern int errno; + #ifdef INCLUDE_SET + # include + #endif ++#ifdef INCLUDE_STRING ++# include ++#endif + #ifdef INCLUDE_VECTOR + # include + #endif +@@ -245,6 +229,19 @@ extern int errno; + # include + #endif + ++/* There are an extraordinary number of issues with . ++ The last straw is that it varies with the locale. Use libiberty's ++ replacement instead. */ ++#include "safe-ctype.h" ++ ++#include ++ ++#include ++ ++#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO ++extern int errno; ++#endif ++ + /* Some of glibc's string inlines cause warnings. Plus we'd rather + rely on (and therefore test) GCC's string builtins. */ + #define __NO_STRING_INLINES diff --git a/build/pkgs/gcc/patches/e95ab9e60ce1d9aa7751d79291133fd5af9209d7.patch b/build/pkgs/gcc/patches/e95ab9e60ce1d9aa7751d79291133fd5af9209d7.patch new file mode 100644 index 00000000000..6fb61b58ed2 --- /dev/null +++ b/build/pkgs/gcc/patches/e95ab9e60ce1d9aa7751d79291133fd5af9209d7.patch @@ -0,0 +1,64 @@ +From: Francois-Xavier Coudert +Date: Sat, 16 Mar 2024 08:50:00 +0000 (+0100) +Subject: libcc1: fix include +X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e95ab9e60ce1d9aa7751d79291133fd5af9209d7 + +libcc1: fix include + +Use INCLUDE_VECTOR before including system.h, instead of directly +including , to avoid running into poisoned identifiers. + +Signed-off-by: Dimitry Andric + + PR middle-end/111632 + +libcc1/ChangeLog: + + * libcc1plugin.cc: Fix include. + * libcp1plugin.cc: Fix include. + +(cherry picked from commit 5213047b1d50af63dfabb5e5649821a6cb157e33) +--- + +diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc +index 7e0fecae1456..44bcf56698ee 100644 +--- a/libcc1/libcc1plugin.cc ++++ b/libcc1/libcc1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -69,8 +70,6 @@ + #include "gcc-c-interface.h" + #include "context.hh" + +-#include +- + using namespace cc1_plugin; + + +diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc +index 8d394c0cfdb8..9586a2afdb47 100644 +--- a/libcc1/libcp1plugin.cc ++++ b/libcc1/libcp1plugin.cc +@@ -33,6 +33,7 @@ + #undef PACKAGE_VERSION + + #define INCLUDE_MEMORY ++#define INCLUDE_VECTOR + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +@@ -71,8 +72,6 @@ + #include "rpc.hh" + #include "context.hh" + +-#include +- + using namespace cc1_plugin; + + diff --git a/build/pkgs/gcc/patches/gcc-13-homebrew.patch b/build/pkgs/gcc/patches/gcc-13-homebrew.patch new file mode 100644 index 00000000000..8cedce8bc46 --- /dev/null +++ b/build/pkgs/gcc/patches/gcc-13-homebrew.patch @@ -0,0 +1,71 @@ +Patch included in https://github.com/Homebrew/homebrew-core/blob/50d9d78a4a09b42807b0a8f74f1f2f8933051a7b/Formula/g/gcc@13.rb + +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 416d2c2e3a4..e52f11d8460 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -2,11 +2,11 @@ + * + * DO NOT EDIT THIS FILE (fixincl.x) + * +- * It has been AutoGen-ed January 22, 2023 at 09:03:29 PM by AutoGen 5.18.12 ++ * It has been AutoGen-ed August 17, 2023 at 10:16:38 AM by AutoGen 5.18.12 + * From the definitions inclhack.def + * and the template file fixincl + */ +-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jan 22 21:03:29 CET 2023 ++/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 17 10:16:38 CEST 2023 + * + * You must regenerate it. Use the ./genfixes script. + * +@@ -3674,7 +3674,7 @@ tSCC* apzDarwin_Flt_Eval_MethodMachs[] = { + * content selection pattern - do fix if pattern found + */ + tSCC zDarwin_Flt_Eval_MethodSelect0[] = +- "^#if __FLT_EVAL_METHOD__ == 0$"; ++ "^#if __FLT_EVAL_METHOD__ == 0( \\|\\| __FLT_EVAL_METHOD__ == -1)?$"; + + #define DARWIN_FLT_EVAL_METHOD_TEST_CT 1 + static tTestDesc aDarwin_Flt_Eval_MethodTests[] = { +@@ -3685,7 +3685,7 @@ static tTestDesc aDarwin_Flt_Eval_MethodTests[] = { + */ + static const char* apzDarwin_Flt_Eval_MethodPatch[] = { + "format", +- "#if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 16", ++ "%0 || __FLT_EVAL_METHOD__ == 16", + (char*)NULL }; + + /* * * * * * * * * * * * * * * * * * * * * * * * * * +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 45e0cbc0c10..19e0ea2df66 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1819,10 +1819,11 @@ fix = { + hackname = darwin_flt_eval_method; + mach = "*-*-darwin*"; + files = math.h; +- select = "^#if __FLT_EVAL_METHOD__ == 0$"; ++ select = "^#if __FLT_EVAL_METHOD__ == 0( \\|\\| __FLT_EVAL_METHOD__ == -1)?$"; + c_fix = format; +- c_fix_arg = "#if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 16"; +- test_text = "#if __FLT_EVAL_METHOD__ == 0"; ++ c_fix_arg = "%0 || __FLT_EVAL_METHOD__ == 16"; ++ test_text = "#if __FLT_EVAL_METHOD__ == 0\n" ++ "#if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == -1"; + }; + + /* +diff --git a/fixincludes/tests/base/math.h b/fixincludes/tests/base/math.h +index 29b67579748..7b92f29a409 100644 +--- a/fixincludes/tests/base/math.h ++++ b/fixincludes/tests/base/math.h +@@ -32,6 +32,7 @@ + + #if defined( DARWIN_FLT_EVAL_METHOD_CHECK ) + #if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 16 ++#if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == -1 || __FLT_EVAL_METHOD__ == 16 + #endif /* DARWIN_FLT_EVAL_METHOD_CHECK */ + + +-- +2.39.3 diff --git a/build/pkgs/gcc/patches/gcc-12.2.0-arm.patch b/build/pkgs/gcc/patches/gcc-13.2.0-arm.patch similarity index 52% rename from build/pkgs/gcc/patches/gcc-12.2.0-arm.patch rename to build/pkgs/gcc/patches/gcc-13.2.0-arm.patch index bcaade28c15..0a3688f7d90 100644 --- a/build/pkgs/gcc/patches/gcc-12.2.0-arm.patch +++ b/build/pkgs/gcc/patches/gcc-13.2.0-arm.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.def b/Makefile.def -index 72d58549645..25b8563a808 100644 +index 35e994eb77e..9b4a8a2bf7a 100644 --- a/Makefile.def +++ b/Makefile.def @@ -47,7 +47,8 @@ host_modules= { module= fixincludes; bootstrap=true; @@ -8,181 +8,256 @@ index 72d58549645..25b8563a808 100644 host_modules= { module= gcc; bootstrap=true; - extra_make_flags="$(EXTRA_GCC_FLAGS)"; }; + extra_make_flags="$(EXTRA_GCC_FLAGS)"; -+ extra_configure_flags='--enable-pie-tools=@enable_pie_tools@'; }; ++ extra_configure_flags='@gcc_host_pie@'; }; host_modules= { module= gmp; lib_path=.libs; bootstrap=true; // Work around in-tree gmp configure bug with missing flex. - extra_configure_flags='--disable-shared LEX="touch lex.yy.c"'; + extra_configure_flags='--disable-shared LEX="touch lex.yy.c" @host_libs_picflag@'; diff --git a/Makefile.in b/Makefile.in -index 593495e1650..807c5947895 100644 +index 06a9398e172..0973ec3a71d 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -112,6 +112,9 @@ GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@ - # If the build should make suitable code for shared host resources. - host_shared = @host_shared@ - -+# If we should build compilers and supporting tools as PIE. -+enable_pie_tools = @enable_pie_tools@ -+ - # Build programs are put under this directory. - BUILD_SUBDIR = @build_subdir@ - # This is set by the configure script to the arguments to use when configuring -@@ -12012,7 +12015,7 @@ configure-gcc: +@@ -12016,7 +12016,7 @@ configure-gcc: $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} \ -+ --target=${target_alias} --enable-pie-tools=@enable_pie_tools@ \ ++ --target=${target_alias} @gcc_host_pie@ \ || exit 1 @endif gcc -@@ -12047,7 +12050,8 @@ configure-stage1-gcc: +@@ -12051,7 +12051,8 @@ configure-stage1-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ \ - $(STAGE1_CONFIGURE_FLAGS) + $(STAGE1_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc -@@ -12080,7 +12084,8 @@ configure-stage2-gcc: +@@ -12084,7 +12085,8 @@ configure-stage2-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + $(STAGE2_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc -@@ -12113,7 +12118,8 @@ configure-stage3-gcc: +@@ -12117,7 +12119,8 @@ configure-stage3-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + $(STAGE3_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc -@@ -12146,7 +12152,8 @@ configure-stage4-gcc: +@@ -12150,7 +12153,8 @@ configure-stage4-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + $(STAGE4_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc -@@ -12179,7 +12186,8 @@ configure-stageprofile-gcc: +@@ -12183,7 +12187,8 @@ configure-stageprofile-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + $(STAGEprofile_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stagetrain-gcc maybe-configure-stagetrain-gcc -@@ -12212,7 +12220,8 @@ configure-stagetrain-gcc: +@@ -12216,7 +12221,8 @@ configure-stagetrain-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEtrain_CONFIGURE_FLAGS) + $(STAGEtrain_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc -@@ -12245,7 +12254,8 @@ configure-stagefeedback-gcc: +@@ -12249,7 +12255,8 @@ configure-stagefeedback-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + $(STAGEfeedback_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stageautoprofile-gcc maybe-configure-stageautoprofile-gcc -@@ -12278,7 +12288,8 @@ configure-stageautoprofile-gcc: +@@ -12282,7 +12289,8 @@ configure-stageautoprofile-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEautoprofile_CONFIGURE_FLAGS) + $(STAGEautoprofile_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap .PHONY: configure-stageautofeedback-gcc maybe-configure-stageautofeedback-gcc -@@ -12311,7 +12322,8 @@ configure-stageautofeedback-gcc: +@@ -12315,7 +12323,8 @@ configure-stageautofeedback-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEautofeedback_CONFIGURE_FLAGS) + $(STAGEautofeedback_CONFIGURE_FLAGS) \ -+ --enable-pie-tools=@enable_pie_tools@ ++ @gcc_host_pie@ @endif gcc-bootstrap -diff --git a/Makefile.tpl b/Makefile.tpl -index ef58fac2b9a..925da105c18 100644 ---- a/Makefile.tpl -+++ b/Makefile.tpl -@@ -115,6 +115,9 @@ GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@ - # If the build should make suitable code for shared host resources. - host_shared = @host_shared@ - -+# If we should build compilers and supporting tools as PIE. -+enable_pie_tools = @enable_pie_tools@ -+ - # Build programs are put under this directory. - BUILD_SUBDIR = @build_subdir@ - # This is set by the configure script to the arguments to use when configuring -diff --git a/config/mh-darwin b/config/mh-darwin -index b72835ae953..bb4112773c9 100644 ---- a/config/mh-darwin -+++ b/config/mh-darwin -@@ -11,7 +11,8 @@ - # non-bootstrapped compiler), later stages will be built by GCC which supports - # the required flags. - --# We cannot use mdynamic-no-pic when building shared host resources. -+# We cannot use mdynamic-no-pic when building shared host resources, or for PIE -+# tool executables, which also enables host-shared. - - ifeq (${host_shared},no) - BOOTSTRAP_TOOL_CAN_USE_MDYNAMIC_NO_PIC := $(shell \ +diff --git a/aclocal.m4 b/aclocal.m4 +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in +index 77bda3d56dc..dcb1029e064 100644 +--- a/c++tools/Makefile.in ++++ b/c++tools/Makefile.in +@@ -29,8 +29,9 @@ AUTOCONF := @AUTOCONF@ + AUTOHEADER := @AUTOHEADER@ + CXX := @CXX@ + CXXFLAGS := @CXXFLAGS@ +-PIEFLAG := @PIEFLAG@ +-CXXOPTS := $(CXXFLAGS) $(PIEFLAG) -fno-exceptions -fno-rtti ++PICFLAG := @PICFLAG@ ++LD_PICFLAG := @LD_PICFLAG@ ++CXXOPTS := $(CXXFLAGS) $(PICFLAG) -fno-exceptions -fno-rtti + LDFLAGS := @LDFLAGS@ + exeext := @EXEEXT@ + LIBIBERTY := ../libiberty/libiberty.a +@@ -90,11 +91,15 @@ ifeq (@CXX_AUX_TOOLS@,yes) + + all::g++-mapper-server$(exeext) + ++ifneq ($(PICFLAG),) ++override LIBIBERTY := ../libiberty/pic/libiberty.a ++endif ++ + MAPPER.O := server.o resolver.o + CODYLIB = ../libcody/libcody.a + CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I. -I../gcc + g++-mapper-server$(exeext): $(MAPPER.O) $(CODYLIB) +- +$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(LIBIBERTY) $(NETLIBS) ++ +$(CXX) $(LDFLAGS) $(PICFLAG) $(LD_PICFLAG) -o $@ $^ $(LIBIBERTY) $(NETLIBS) + + # copy to gcc dir so tests there can run + all::../gcc/g++-mapper-server$(exeext) +diff --git a/c++tools/configure b/c++tools/configure +index 742816e4253..88087009383 100755 +--- a/c++tools/configure ++++ b/c++tools/configure +@@ -627,7 +627,8 @@ get_gcc_base_ver + EGREP + GREP + CXXCPP +-PIEFLAG ++LD_PICFLAG ++PICFLAG + MAINTAINER + CXX_AUX_TOOLS + AUTOHEADER +@@ -700,6 +701,7 @@ enable_c___tools + enable_maintainer_mode + enable_checking + enable_default_pie ++enable_host_pie + with_gcc_major_version_only + ' + ac_precious_vars='build_alias +@@ -1333,6 +1335,7 @@ Optional Features: + only specific categories of checks. Categories are: + yes,no,all,none,release. + --enable-default-pie enable Position Independent Executable as default ++ --enable-host-pie build host code as PIE + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -2990,12 +2993,20 @@ fi + # Check whether --enable-default-pie was given. + # Check whether --enable-default-pie was given. + if test "${enable_default_pie+set}" = set; then : +- enableval=$enable_default_pie; PIEFLAG=-fPIE ++ enableval=$enable_default_pie; PICFLAG=-fPIE + else +- PIEFLAG= ++ PICFLAG= + fi + + ++# Enable --enable-host-pie ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; PICFLAG=-fPIE; LD_PICFLAG=-pie ++fi ++ ++ ++ + + # Check if O_CLOEXEC is defined by fcntl + +diff --git a/c++tools/configure.ac b/c++tools/configure.ac +index 23e98c8e721..44dfaccbbfa 100644 +--- a/c++tools/configure.ac ++++ b/c++tools/configure.ac +@@ -102,8 +102,15 @@ fi + AC_ARG_ENABLE(default-pie, + [AS_HELP_STRING([--enable-default-pie], + [enable Position Independent Executable as default])], +-[PIEFLAG=-fPIE], [PIEFLAG=]) +-AC_SUBST([PIEFLAG]) ++[PICFLAG=-fPIE], [PICFLAG=]) ++ ++# Enable --enable-host-pie ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])], ++[PICFLAG=-fPIE; LD_PICFLAG=-pie], []) ++AC_SUBST(PICFLAG) ++AC_SUBST(LD_PICFLAG) + + # Check if O_CLOEXEC is defined by fcntl + AC_CACHE_CHECK(for O_CLOEXEC, ac_cv_o_cloexec, [ diff --git a/configure b/configure -index 5dcaab14ae9..c690bbec82b 100755 +index 117a7ef23f2..ee9dd18d2a3 100755 --- a/configure +++ b/configure -@@ -685,6 +685,7 @@ get_gcc_base_ver - extra_host_zlib_configure_flags +@@ -687,7 +687,10 @@ extra_host_zlib_configure_flags extra_host_libiberty_configure_flags stage1_languages -+enable_pie_tools + host_libs_picflag ++PICFLAG host_shared ++gcc_host_pie ++host_pie extra_linker_plugin_flags extra_linker_plugin_configure_flags -@@ -830,6 +831,7 @@ enable_lto + islinc +@@ -830,6 +833,7 @@ enable_isl_version_check + enable_lto enable_linker_plugin_configure_flags enable_linker_plugin_flags ++enable_host_pie enable_host_shared -+enable_pie_tools enable_stage1_languages enable_objc_gc - with_target_bdw_gc -@@ -1558,6 +1560,8 @@ Optional Features: +@@ -1558,6 +1562,7 @@ Optional Features: + --enable-linker-plugin-flags=FLAGS additional flags for configuring and building linker plugins [none] ++ --enable-host-pie build position independent host executables --enable-host-shared build host code as shared libraries -+ --enable-pie-tools build Position Independent Executables for the -+ compilers and other tools --enable-stage1-languages[=all] choose additional languages to build during stage1. - Mostly useful for compiler development -@@ -8410,6 +8414,20 @@ else +@@ -8414,6 +8419,20 @@ else fi fi @@ -203,54 +278,112 @@ index 5dcaab14ae9..c690bbec82b 100755 # GCC GRAPHITE dependency isl. -@@ -8663,6 +8681,42 @@ else - fi - - -+# Check whether --enable-pie-tools was given. -+# Checked early because it can affect host make fragments. -+# Check whether --enable-pie-tools was given. -+if test "${enable_pie_tools+set}" = set; then : -+ enableval=$enable_pie_tools; enable_pie_tools=$enableval -+ case $target in -+ aarch64-*-darwin1[1-9]*) -+ if test x$enable_pie_tools != xyes ; then -+ echo configure.ac: warning: aarch64-darwin must use PIE, pie-tools setting ignored. 1>&2 -+ enable_pie_tools=yes -+ host_shared=yes +@@ -8645,6 +8664,39 @@ fi + + + ++# Handle --enable-host-pie ++# If host PIE executables are the default (or must be forced on) for some host, ++# we must pass that configuration to the gcc directory. ++gcc_host_pie= ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; host_pie=$enableval ++ case $host in ++ *-*-darwin2*) ++ if test x$host_pie != xyes ; then ++ # for Darwin20+ this is required. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PIE executables are required for the configured host, host-pie setting ignored." >&5 ++$as_echo "$as_me: WARNING: PIE executables are required for the configured host, host-pie setting ignored." >&2;} ++ host_pie=yes ++ gcc_host_pie=--enable-host-pie + fi ;; -+ *) ;; ++ *) ;; + esac +else -+ case $target in -+ # PIE is the default for macOS 10.7+ so reflect that in the configure. -+ # However, we build 32b toolchains mdynamic-no-pic by default which is -+ # not compatible with PIE. -+ x86_64-*-darwin1[1-9]* | *-*-darwin2*) enable_pie_tools=yes ;; -+ *) enable_pie_tools=no ;; ++ case $host in ++ *-*-darwin2*) ++ # Default to PIE (mandatory for aarch64). ++ host_pie=yes ++ gcc_host_pie=--enable-host-pie ++ ;; ++ *) host_pie=no ;; + esac +fi + + -+case $target in -+ *-*-darwin*) -+ if test x$enable_pie_tools = xyes && test x$host_shared != xyes ; then -+ echo configure.ac: warning: for Darwin PIE requires PIC code, switching host-shared on 1>&2 -+ host_shared=yes -+ fi ;; -+ *) ;; -+esac + + + + # Enable --enable-host-shared. + # Checked early to determine whether jit is an 'all' language + # Check whether --enable-host-shared was given. +@@ -8654,26 +8706,57 @@ if test "${enable_host_shared+set}" = set; then : + x86_64-*-darwin* | aarch64-*-darwin*) + if test x$host_shared != xyes ; then + # PIC is the default, and actually cannot be switched off. +- echo configure.ac: warning: PIC code is required for the configured target, host-shared setting ignored. 1>&2 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PIC code is required for the configured host; host-shared setting ignored." >&5 ++$as_echo "$as_me: WARNING: PIC code is required for the configured host; host-shared setting ignored." >&2;} ++ host_shared=yes ++ fi ;; ++ *-*-darwin*) ++ if test x$host_pie = xyes -a x$host_shared != xyes ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PIC code is required for PIE host executables host-shared setting ignored." >&5 ++$as_echo "$as_me: WARNING: PIC code is required for PIE host executables host-shared setting ignored." >&2;} + host_shared=yes + fi ;; + *) ;; + esac + else + case $host in ++ # 64B x86_64 and Aarch64 Darwin default to PIC. + x86_64-*-darwin* | aarch64-*-darwin*) host_shared=yes ;; +- *) host_shared=no ;; ++ # 32B and powerpc64 Darwin must use PIC to link PIE exes. ++ *-*-darwin*) host_shared=$host_pie ;; ++ *) host_shared=no;; + esac + fi + + + + ++if test x$host_shared = xyes; then ++ case $host in ++ *-*-darwin*) ++ # Since host shared is the default for 64b Darwin, and also enabled for ++ # host_pie, ensure that we present the PIE flag when host_pie is active. ++ if test x$host_pie = xyes; then ++ PICFLAG=-fPIE ++ fi ++ ;; ++ *) ++ PICFLAG=-fPIC ++ ;; ++ esac ++elif test x$host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi ++ ++ ++ + # If we are building PIC/PIE host executables, and we are building dependent + # libs (e.g. GMP) in-tree those libs need to be configured to generate PIC + # code. + host_libs_picflag= +-if test "$host_shared" = "yes";then ++if test "$host_shared" = "yes" -o "$host_pie" = "yes"; then + host_libs_picflag='--with-pic' + fi - # By default, C and C++ are the only stage 1 languages. - stage1_languages=,c, diff --git a/configure.ac b/configure.ac -index 85977482aee..72bd20fda66 100644 +index b3e9bbd2aa5..4d390f86c7e 100644 --- a/configure.ac +++ b/configure.ac -@@ -1827,6 +1827,20 @@ AC_ARG_WITH(boot-ldflags, +@@ -1806,6 +1806,20 @@ AC_ARG_WITH(boot-ldflags, if test "$poststage1_libs" = ""; then poststage1_ldflags="-static-libstdc++ -static-libgcc" fi]) @@ -271,120 +404,304 @@ index 85977482aee..72bd20fda66 100644 AC_SUBST(poststage1_ldflags) # GCC GRAPHITE dependency isl. -@@ -1931,7 +1945,41 @@ AC_ARG_ENABLE(host-shared, - x86_64-*-darwin* | aarch64-*-darwin*) host_shared=yes ;; - *) host_shared=no ;; - esac]) -+ -+# Check whether --enable-pie-tools was given. -+# Checked early because it can affect host make fragments. -+AC_ARG_ENABLE(pie-tools, -+[AS_HELP_STRING([--enable-pie-tools], -+ [build Position Independent Executables for the compilers and other tools])], -+[enable_pie_tools=$enableval -+ case $target in -+ aarch64-*-darwin1[[1-9]]*) -+ if test x$enable_pie_tools != xyes ; then -+ echo configure.ac: warning: aarch64-darwin must use PIE, pie-tools setting ignored. 1>&2 -+ enable_pie_tools=yes -+ host_shared=yes +@@ -1891,6 +1905,36 @@ AC_ARG_ENABLE(linker-plugin-flags, + extra_linker_plugin_flags=) + AC_SUBST(extra_linker_plugin_flags) + ++# Handle --enable-host-pie ++# If host PIE executables are the default (or must be forced on) for some host, ++# we must pass that configuration to the gcc directory. ++gcc_host_pie= ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build position independent host executables])], ++[host_pie=$enableval ++ case $host in ++ *-*-darwin2*) ++ if test x$host_pie != xyes ; then ++ # for Darwin20+ this is required. ++ AC_MSG_WARN([PIE executables are required for the configured host, host-pie setting ignored.]) ++ host_pie=yes ++ gcc_host_pie=--enable-host-pie + fi ;; -+ *) ;; ++ *) ;; + esac], -+[case $target in -+ # PIE is the default for macOS 10.7+ so reflect that in the configure. -+ # However, we build 32b toolchains mdynamic-no-pic by default which is -+ # not compatible with PIE. -+ x86_64-*-darwin1[[1-9]]* | *-*-darwin2*) enable_pie_tools=yes ;; -+ *) enable_pie_tools=no ;; ++[case $host in ++ *-*-darwin2*) ++ # Default to PIE (mandatory for aarch64). ++ host_pie=yes ++ gcc_host_pie=--enable-host-pie ++ ;; ++ *) host_pie=no ;; + esac]) + -+case $target in -+ *-*-darwin*) -+ if test x$enable_pie_tools = xyes && test x$host_shared != xyes ; then -+ echo configure.ac: warning: for Darwin PIE requires PIC code, switching host-shared on 1>&2 -+ host_shared=yes -+ fi ;; -+ *) ;; -+esac -+ ++AC_SUBST(host_pie) ++AC_SUBST(gcc_host_pie) ++ + # Enable --enable-host-shared. + # Checked early to determine whether jit is an 'all' language + AC_ARG_ENABLE(host-shared, +@@ -1901,23 +1945,52 @@ AC_ARG_ENABLE(host-shared, + x86_64-*-darwin* | aarch64-*-darwin*) + if test x$host_shared != xyes ; then + # PIC is the default, and actually cannot be switched off. +- echo configure.ac: warning: PIC code is required for the configured target, host-shared setting ignored. 1>&2 ++ AC_MSG_WARN([PIC code is required for the configured host; host-shared setting ignored.]) ++ host_shared=yes ++ fi ;; ++ *-*-darwin*) ++ if test x$host_pie = xyes -a x$host_shared != xyes ; then ++ AC_MSG_WARN([PIC code is required for PIE host executables host-shared setting ignored.]) + host_shared=yes + fi ;; + *) ;; + esac], + [case $host in ++ # 64B x86_64 and Aarch64 Darwin default to PIC. + x86_64-*-darwin* | aarch64-*-darwin*) host_shared=yes ;; +- *) host_shared=no ;; ++ # 32B and powerpc64 Darwin must use PIC to link PIE exes. ++ *-*-darwin*) host_shared=$host_pie ;; ++ *) host_shared=no;; + esac]) + AC_SUBST(host_shared) -+AC_SUBST([enable_pie_tools]) - - # By default, C and C++ are the only stage 1 languages. - stage1_languages=,c, -diff --git a/contrib/compare-debug b/contrib/compare-debug -index cf80ae32695..678a897c931 100755 ---- a/contrib/compare-debug -+++ b/contrib/compare-debug -@@ -60,9 +60,19 @@ trap 'rm -f "$1.$suf1" "$2.$suf2"' 0 1 2 15 - case `uname -s` in - Darwin) - # The strip command on darwin does not remove all debug info. -- # Fortunately, we can use ld to do it instead. -- ld -S -r -no_uuid "$1" -o "$1.$suf1" -- ld -S -r -no_uuid "$2" -o "$2.$suf2" -+ # Fortunately, we can use ld to do it instead, but even ld on earlier -+ # system versions can be fussy about what it finds - make sure we use -+ # a ld that understands coalesced sections. -+ case `uname -r` in -+ 8*) -+ ld64 -S -r -no_uuid "$1" -o "$1.$suf1" -+ ld64 -S -r -no_uuid "$2" -o "$2.$suf2" -+ ;; -+ *) -+ ld -S -r -no_uuid "$1" -o "$1.$suf1" -+ ld -S -r -no_uuid "$2" -o "$2.$suf2" -+ ;; + ++if test x$host_shared = xyes; then ++ case $host in ++ *-*-darwin*) ++ # Since host shared is the default for 64b Darwin, and also enabled for ++ # host_pie, ensure that we present the PIE flag when host_pie is active. ++ if test x$host_pie = xyes; then ++ PICFLAG=-fPIE ++ fi ++ ;; ++ *) ++ PICFLAG=-fPIC ++ ;; + esac - ;; - *) - cp "$1" "$1.$suf1" ++elif test x$host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi ++ ++AC_SUBST(PICFLAG) ++ + # If we are building PIC/PIE host executables, and we are building dependent + # libs (e.g. GMP) in-tree those libs need to be configured to generate PIC + # code. + host_libs_picflag= +-if test "$host_shared" = "yes";then ++if test "$host_shared" = "yes" -o "$host_pie" = "yes"; then + host_libs_picflag='--with-pic' + fi + AC_SUBST(host_libs_picflag) +diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in +index 1937dcaa32d..e6ce41dba39 100644 +--- a/fixincludes/Makefile.in ++++ b/fixincludes/Makefile.in +@@ -73,7 +73,7 @@ default : all + # Now figure out from those variables how to compile and link. + + .c.o: +- $(CC) -c $(CFLAGS) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CFLAGS) $< ++ $(CC) -c $(CFLAGS) $(PICFLAG) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CFLAGS) $< + + # The only suffixes we want for implicit rules are .c and .o. + .SUFFIXES: +@@ -87,7 +87,11 @@ default : all + ## + ## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + ++ifeq ($(PICFLAG),) + LIBIBERTY=../libiberty/libiberty.a ++else ++LIBIBERTY=../libiberty/pic/libiberty.a ++endif + + ALLOBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \ + fixlib.o fixopts.o +@@ -107,15 +111,15 @@ oneprocess : full-stamp + twoprocess : test-stamp $(AF) + + full-stamp : $(ALLOBJ) $(LIBIBERTY) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(ALLOBJ) $(LIBIBERTY) ++ $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $(FI) $(ALLOBJ) $(LIBIBERTY) + $(STAMP) $@ + + test-stamp : $(TESTOBJ) $(LIBIBERTY) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(TESTOBJ) $(LIBIBERTY) ++ $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $(FI) $(TESTOBJ) $(LIBIBERTY) + $(STAMP) $@ + + $(AF): $(FIXOBJ) $(LIBIBERTY) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FIXOBJ) $(LIBIBERTY) ++ $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $@ $(FIXOBJ) $(LIBIBERTY) + + $(ALLOBJ) : $(HDR) + fixincl.o : fixincl.c $(srcdir)/fixincl.x diff --git a/fixincludes/configure b/fixincludes/configure -index 6e2d67b655b..b3bca666a4d 100755 +index bdcc41f6ddc..a5e995f5316 100755 --- a/fixincludes/configure +++ b/fixincludes/configure -@@ -2644,7 +2644,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +@@ -623,6 +623,8 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + get_gcc_base_ver + MAINT ++LD_PICFLAG ++PICFLAG + TARGET + target_noncanonical + WERROR +@@ -695,6 +697,7 @@ enable_option_checking + enable_werror_always + with_local_prefix + enable_twoprocess ++enable_host_pie + enable_maintainer_mode + with_gcc_major_version_only + ' +@@ -1323,6 +1326,7 @@ Optional Features: + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-werror-always enable -Werror despite compiler version + --enable-twoprocess Use a separate process to apply the fixes ++ --enable-host-pie build host code as PIE + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + +@@ -3022,6 +3026,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # --------------------------- + # _LT_COMPILER_PIC + ++enable_darwin_at_rpath_$1=no + + # _LT_LINKER_SHLIBS([TAGNAME]) + # ---------------------------- +@@ -3044,7 +3049,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # the compiler configuration to `libtool'. + # _LT_LANG_CXX_CONFIG + +- + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -4835,6 +4839,15 @@ $as_echo "#define SEPARATE_FIX_PROC 1" >>confdefs.h + + fi - # _LT_DARWIN_LINKER_FEATURES - # -------------------------- --# Checks for linker and compiler features on darwin -+# Checks for linker and compiler features on Darwin / macOS / iOS ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; PICFLAG=-fPIE; LD_PICFLAG=-pie ++fi ++ ++ ++ ++ + case $host in + vax-dec-bsd* ) +diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac +index ef2227e3c93..4e78511d20f 100644 +--- a/fixincludes/configure.ac ++++ b/fixincludes/configure.ac +@@ -68,6 +68,14 @@ if test $TARGET = twoprocess; then + [Define if testing and fixing are done by separate process]) + fi - # _LT_SYS_MODULE_PATH_AIX ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])], ++[PICFLAG=-fPIE; LD_PICFLAG=-pie], []) ++AC_SUBST(PICFLAG) ++AC_SUBST(LD_PICFLAG) ++ + case $host in + vax-dec-bsd* ) + AC_DEFINE(exit, xexit, [Define to xexit if the host system does not support atexit]) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 31ff95500c9..255a10c2ce8 100644 +index 775aaa1b3c4..2b0d8f9cd01 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in -@@ -270,11 +270,15 @@ COMPILER += $(CET_HOST_FLAGS) - NO_PIE_CFLAGS = @NO_PIE_CFLAGS@ - NO_PIE_FLAG = @NO_PIE_FLAG@ +@@ -158,6 +158,9 @@ LDFLAGS = @LDFLAGS@ + # Should we build position-independent host code? + PICFLAG = @PICFLAG@ + ++# The linker flag for the above. ++LD_PICFLAG = @LD_PICFLAG@ ++ + # Flags to determine code coverage. When coverage is disabled, this will + # contain the optimization flags, as you normally want code coverage + # without optimization. +@@ -266,19 +269,19 @@ LINKER = $(CC) + LINKER_FLAGS = $(CFLAGS) + endif + ++enable_host_pie = @enable_host_pie@ ++ + # Enable Intel CET on Intel CET enabled host if needed. + CET_HOST_FLAGS = @CET_HOST_FLAGS@ + COMPILER += $(CET_HOST_FLAGS) + +-NO_PIE_CFLAGS = @NO_PIE_CFLAGS@ +-NO_PIE_FLAG = @NO_PIE_FLAG@ + DO_LINK_MUTEX = @DO_LINK_MUTEX@ -# We don't want to compile the compilers with -fPIE, it make PCH fail. -+ifneq (@enable_pie_tools@,yes) -+# Build and link the compilers and tools without PIE. - COMPILER += $(NO_PIE_CFLAGS) -- +-COMPILER += $(NO_PIE_CFLAGS) ++# Maybe compile the compilers with -fPIE or -fPIC. ++COMPILER += $(PICFLAG) + -# Link with -no-pie since we compile the compiler with -fno-PIE. - LINKER += $(NO_PIE_FLAG) -+else -+# FIXME these need to be configured. -+COMPILER += -fPIE -+LINKER += -pie -+endif +-LINKER += $(NO_PIE_FLAG) ++# Link with -pie, or -no-pie, depending on the above. ++LINKER += $(LD_PICFLAG) # Like LINKER, but use a mutex for serializing front end links. ifeq (@DO_LINK_MUTEX@,true) -@@ -407,6 +411,7 @@ ifeq ($(enable_plugin),yes) +@@ -1050,7 +1053,7 @@ RTL_SSA_H = $(PRETTY_PRINT_H) insn-config.h splay-tree-utils.h \ + # programs built during a bootstrap. + # autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a + # cross compiler which does not use the native headers and libraries. +-INTERNAL_CFLAGS = -DIN_GCC $(PICFLAG) @CROSS@ ++INTERNAL_CFLAGS = -DIN_GCC @CROSS@ + + # This is the variable actually used when we compile. If you change this, + # you probably want to update BUILD_CFLAGS in configure.ac +@@ -1068,21 +1071,24 @@ ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) $(INTERNAL_CFLAGS) \ + ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) + + # This is the variable to use when using $(COMPILER). +-ALL_COMPILERFLAGS = $(ALL_CXXFLAGS) ++ALL_COMPILERFLAGS = $(ALL_CXXFLAGS) $(PICFLAG) + + # This is the variable to use when using $(LINKER). +-ALL_LINKERFLAGS = $(ALL_CXXFLAGS) ++ALL_LINKERFLAGS = $(ALL_CXXFLAGS) $(LD_PICFLAG) + + # Build and host support libraries. + +-# Use the "pic" build of libiberty if --enable-host-shared, unless we are +-# building for mingw. ++# Use the "pic" build of libiberty if --enable-host-shared or --enable-host-pie, ++# unless we are building for mingw. + LIBIBERTY_PICDIR=$(if $(findstring mingw,$(target)),,pic) +-ifeq ($(enable_host_shared),yes) ++ifneq ($(enable_host_shared)$(enable_host_pie),) + LIBIBERTY = ../libiberty/$(LIBIBERTY_PICDIR)/libiberty.a +-BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/$(LIBIBERTY_PICDIR)/libiberty.a + else + LIBIBERTY = ../libiberty/libiberty.a ++endif ++ifeq ($(enable_host_shared),yes) ++BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/$(LIBIBERTY_PICDIR)/libiberty.a ++else + BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a endif - enable_host_shared = @enable_host_shared@ -+enable_default_pie = @enable_default_pie@ - - enable_as_accelerator = @enable_as_accelerator@ - -@@ -1153,6 +1158,8 @@ LANG_MAKEFRAGS = @all_lang_makefrags@ +@@ -1167,6 +1173,8 @@ LANG_MAKEFRAGS = @all_lang_makefrags@ # Used by gcc/jit/Make-lang.in LD_VERSION_SCRIPT_OPTION = @ld_version_script_option@ LD_SONAME_OPTION = @ld_soname_option@ @@ -393,7 +710,7 @@ index 31ff95500c9..255a10c2ce8 100644 # Flags to pass to recursive makes. # CC is set by configure. -@@ -1942,9 +1949,12 @@ cs-tconfig.h: Makefile +@@ -1973,9 +1981,12 @@ cs-tconfig.h: Makefile $(SHELL) $(srcdir)/mkconfig.sh tconfig.h cs-tm.h: Makefile @@ -409,7 +726,7 @@ index 31ff95500c9..255a10c2ce8 100644 cs-tm_p.h: Makefile TARGET_CPU_DEFAULT="" \ -@@ -4116,6 +4126,9 @@ site.exp: ./config.status Makefile +@@ -4141,6 +4152,9 @@ site.exp: ./config.status Makefile echo "set COMPAT_OPTIONS \"$(COMPAT_OPTIONS)\"" >> ./site.tmp; \ else true; \ fi @@ -480,62 +797,94 @@ index 6be36df5190..126e09bbcd1 100644 m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) -diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl -index aaf853e3a2a..b20218310f3 100644 ---- a/gcc/ada/Makefile.rtl -+++ b/gcc/ada/Makefile.rtl -@@ -2822,6 +2822,15 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),) - TOOLS_TARGET_PAIRS = indepsw.adbaapcs_vfp_rmode, nregs, NULL, pcum->silent_p); } @@ -1063,21 +1388,22 @@ index 5c9e7791a12..91258c925a8 100644 /* Given MODE and TYPE of a function argument, return the alignment in bits. The idea is to suppress any stronger alignment requested by -@@ -7343,6 +7371,13 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) - return; +@@ -7641,6 +7669,14 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) + Both behaviors were wrong, but in different cases. */ pcum->aapcs_arg_processed = true; + if (TARGET_MACHO) + { + /* Set suitable defaults for queries. */ + pcum->darwinpcs_arg_boundary -+ = aarch64_function_arg_alignment (mode, type, &abi_break); ++ = aarch64_function_arg_alignment (mode, type, &abi_break, ++ &abi_break_packed); + pcum->darwinpcs_arg_padding = BITS_PER_UNIT; + } pure_scalable_type_info pst_info; if (type && pst_info.analyze_registers (type)) -@@ -7399,13 +7434,29 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) +@@ -7700,13 +7736,29 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) /* No frontends can create types with variable-sized modes, so we shouldn't be asked to pass or return them. */ size = GET_MODE_SIZE (mode).to_constant (); @@ -1085,7 +1411,7 @@ index 5c9e7791a12..91258c925a8 100644 + if (TARGET_MACHO) + /* Since we can pack things on the stack, we need the unrounded size. */ + pcum->darwinpcs_stack_bytes = size; -+ ++ size = ROUND_UP (size, UNITS_PER_WORD); allocate_ncrn = (type) ? !(FLOAT_TYPE_P (type)) : !FLOAT_MODE_P (mode); @@ -1100,14 +1426,14 @@ index 5c9e7791a12..91258c925a8 100644 + so use this call directly. */ + allocate_nvrn + = aarch64_vfp_is_call_or_return_candidate (mode, type, -+ &pcum->aapcs_vfp_rmode, -+ &nregs, &is_ha, -+ pcum->silent_p); ++ &pcum->aapcs_vfp_rmode, ++ &nregs, &is_ha, ++ pcum->silent_p); +#endif gcc_assert (!sve_p || !allocate_nvrn); - /* allocate_ncrn may be false-positive, but allocate_nvrn is quite reliable. -@@ -7420,7 +7471,13 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) + unsigned int alignment +@@ -7727,7 +7779,13 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) if (!pcum->silent_p && !TARGET_FLOAT) aarch64_err_no_fpadvsimd (mode); @@ -1122,7 +1448,7 @@ index 5c9e7791a12..91258c925a8 100644 { pcum->aapcs_nextnvrn = nvrn + nregs; if (!aarch64_composite_type_p (type, mode)) -@@ -7450,6 +7507,7 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) +@@ -7757,6 +7815,7 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) } pcum->aapcs_reg = par; } @@ -1130,7 +1456,7 @@ index 5c9e7791a12..91258c925a8 100644 return; } else -@@ -7466,10 +7524,18 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) +@@ -7773,14 +7832,24 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) /* C6 - C9. though the sign and zero extension semantics are handled elsewhere. This is the case where the argument fits entirely general registers. */ @@ -1149,18 +1475,14 @@ index 5c9e7791a12..91258c925a8 100644 /* C.8 if the argument has an alignment of 16 then the NGRN is rounded up to the next even number. */ if (nregs == 2 -@@ -7479,7 +7545,9 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) - alignment nregs should be > 2 and therefore it should be - passed by reference rather than value. */ - && (aarch64_function_arg_alignment (mode, type, &abi_break) -- == 16 * BITS_PER_UNIT)) -+ == 16 * BITS_PER_UNIT) +- && ncrn % 2) ++ && ncrn % 2 + /* Darwin PCS deletes rule C.8. */ + && !TARGET_MACHO) { - if (abi_break && warn_psabi && currently_expanding_gimple_stmt) - inform (input_location, "parameter passing for argument of type " -@@ -7525,8 +7593,8 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) + /* Emit a warning if the alignment changed when taking the + 'packed' attribute into account. */ +@@ -7842,8 +7911,8 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) } pcum->aapcs_reg = par; } @@ -1170,16 +1492,18 @@ index 5c9e7791a12..91258c925a8 100644 return; } -@@ -7536,10 +7604,87 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) +@@ -7853,7 +7922,6 @@ aarch64_layout_arg (cumulative_args_t pcum_v, const function_arg_info &arg) /* The argument is passed on stack; record the needed number of words for this argument and align the total size if necessary. */ on_stack: - pcum->aapcs_stack_words = size / UNITS_PER_WORD; -- if (aarch64_function_arg_alignment (mode, type, &abi_break) -- == 16 * BITS_PER_UNIT) -+ unsigned int align = aarch64_function_arg_alignment (mode, type, &abi_break); -+ + if (warn_pcs_change + && abi_break_packed +@@ -7862,6 +7930,83 @@ on_stack: + inform (input_location, "parameter passing for argument of type " + "%qT changed in GCC 13.1", type); + + if (TARGET_MACHO) + { + /* Darwin does not round up the allocation for smaller entities to 8 @@ -1209,7 +1533,7 @@ index 5c9e7791a12..91258c925a8 100644 + pcum->aapcs_stack_words = size / UNITS_PER_WORD; + pcum->darwinpcs_sub_word_offset = 0; + pcum->darwinpcs_sub_word_pos = 0; -+ pcum->darwinpcs_arg_boundary = MAX (align, PARM_BOUNDARY); ++ pcum->darwinpcs_arg_boundary = MAX (alignment, PARM_BOUNDARY); + if (!pcum->named_p) + pcum->darwinpcs_arg_padding = PARM_BOUNDARY; + return; @@ -1220,7 +1544,7 @@ index 5c9e7791a12..91258c925a8 100644 + existing object(s) in the same stack slot. In that case, we do not + need to add any more stack space for it. */ + int new_off -+ = ROUND_UP (pcum->darwinpcs_sub_word_pos, align / BITS_PER_UNIT); ++ = ROUND_UP (pcum->darwinpcs_sub_word_pos, alignment / BITS_PER_UNIT); + + if (new_off >= UNITS_PER_WORD) + { @@ -1241,7 +1565,7 @@ index 5c9e7791a12..91258c925a8 100644 + not add any stack space. */ + pcum->darwinpcs_sub_word_offset = new_off; + pcum->darwinpcs_sub_word_pos = new_pos; -+ pcum->darwinpcs_arg_boundary = align; ++ pcum->darwinpcs_arg_boundary = alignment ; + if (pcum->last_named_p && new_pos > 0) + { + /* Round the last named arg to the start of the next stack slot. */ @@ -1257,11 +1581,10 @@ index 5c9e7791a12..91258c925a8 100644 + + /* size was already rounded up to PARM_BOUNDARY. */ + pcum->aapcs_stack_words = size / UNITS_PER_WORD; -+ if (align == 16 * BITS_PER_UNIT) + if (alignment == 16 * BITS_PER_UNIT) { int new_size = ROUND_UP (pcum->aapcs_stack_size, 16 / UNITS_PER_WORD); - if (pcum->aapcs_stack_size != new_size) -@@ -7592,7 +7737,28 @@ aarch64_init_cumulative_args (CUMULATIVE_ARGS *pcum, +@@ -7915,7 +8060,28 @@ aarch64_init_cumulative_args (CUMULATIVE_ARGS *pcum, pcum->aapcs_arg_processed = false; pcum->aapcs_stack_words = 0; pcum->aapcs_stack_size = 0; @@ -1290,7 +1613,7 @@ index 5c9e7791a12..91258c925a8 100644 if (!silent_p && !TARGET_FLOAT -@@ -7631,8 +7797,10 @@ aarch64_function_arg_advance (cumulative_args_t pcum_v, +@@ -7954,8 +8120,10 @@ aarch64_function_arg_advance (cumulative_args_t pcum_v, || pcum->pcs_variant == ARM_PCS_SVE) { aarch64_layout_arg (pcum_v, arg); @@ -1303,21 +1626,21 @@ index 5c9e7791a12..91258c925a8 100644 pcum->aapcs_arg_processed = false; pcum->aapcs_ncrn = pcum->aapcs_nextncrn; pcum->aapcs_nvrn = pcum->aapcs_nextnvrn; -@@ -7640,6 +7808,12 @@ aarch64_function_arg_advance (cumulative_args_t pcum_v, +@@ -7963,6 +8131,12 @@ aarch64_function_arg_advance (cumulative_args_t pcum_v, pcum->aapcs_stack_size += pcum->aapcs_stack_words; pcum->aapcs_stack_words = 0; pcum->aapcs_reg = NULL_RTX; + pcum->darwinpcs_arg_boundary = BITS_PER_UNIT; + pcum->darwinpcs_arg_padding = BITS_PER_UNIT; + pcum->named_p -+ = pcum->darwinpcs_n_args_processed < pcum->darwinpcs_n_named; ++ = pcum->darwinpcs_n_args_processed < pcum->darwinpcs_n_named; + pcum->last_named_p -+ = pcum->darwinpcs_n_args_processed + 1 == pcum->darwinpcs_n_named; ++ = pcum->darwinpcs_n_args_processed + 1 == pcum->darwinpcs_n_named; } } -@@ -7650,12 +7824,15 @@ aarch64_function_arg_regno_p (unsigned regno) - || (FP_REGNUM_P (regno) && regno < V0_REGNUM + NUM_FP_ARG_REGS)); +@@ -7974,12 +8148,15 @@ aarch64_function_arg_regno_p (unsigned regno) + || (PR_REGNUM_P (regno) && regno < P0_REGNUM + NUM_PR_ARG_REGS)); } -/* Implement FUNCTION_ARG_BOUNDARY. Every parameter gets at least @@ -1327,8 +1650,8 @@ index 5c9e7791a12..91258c925a8 100644 - Stacked Argument Address (NSAA) will have a minimum alignment of - 8 bytes. */ +/* Implement FUNCTION_ARG_BOUNDARY. -+ For AAPCS64, Every parameter gets at least PARM_BOUNDARY bits of -+ alignment, but will be given anything up to STACK_BOUNDARY bits ++ For AAPCS64, Every parameter gets at least PARM_BOUNDARY bits of ++ alignment, but will be given anything up to STACK_BOUNDARY bits + if the type requires it. This makes sure that both before and after + the layout of each argument, the Next Stacked Argument Address (NSAA) + will have a minimum alignment of 8 bytes. @@ -1338,10 +1661,10 @@ index 5c9e7791a12..91258c925a8 100644 static unsigned int aarch64_function_arg_boundary (machine_mode mode, const_tree type) -@@ -7663,6 +7840,71 @@ aarch64_function_arg_boundary (machine_mode mode, const_tree type) - unsigned int abi_break; - unsigned int alignment = aarch64_function_arg_alignment (mode, type, - &abi_break); +@@ -7991,8 +8168,107 @@ aarch64_function_arg_boundary (machine_mode mode, const_tree type) + &abi_break_packed); + /* We rely on aarch64_layout_arg and aarch64_gimplify_va_arg_expr + to emit warnings about ABI incompatibility. */ +#if TARGET_MACHO + /* This can only work for unnamed args. */ + machine_mode comp_mode = VOIDmode; @@ -1357,14 +1680,6 @@ index 5c9e7791a12..91258c925a8 100644 + return MIN (alignment, STACK_BOUNDARY); +#else + alignment = MIN (MAX (alignment, PARM_BOUNDARY), STACK_BOUNDARY); -+ if (abi_break & warn_psabi) -+ { -+ abi_break = MIN (MAX (abi_break, PARM_BOUNDARY), STACK_BOUNDARY); -+ if (alignment != abi_break && !TARGET_MACHO) -+ inform (input_location, "parameter passing for argument of type " -+ "%qT changed in GCC 9.1", type); -+ } -+ + return alignment; +#endif +} @@ -1379,8 +1694,12 @@ index 5c9e7791a12..91258c925a8 100644 + cumulative_args_t ca ATTRIBUTE_UNUSED) +{ + unsigned int abi_break; ++ unsigned int abi_break_packed; + unsigned int alignment = aarch64_function_arg_alignment (mode, type, -+ &abi_break); ++ &abi_break, ++ &abi_break_packed); ++ /* We rely on aarch64_layout_arg and aarch64_gimplify_va_arg_expr ++ to emit warnings about ABI incompatibility. */ +#if TARGET_MACHO + CUMULATIVE_ARGS *pcum = get_cumulative_args (ca); +gcc_checking_assert (pcum->aapcs_arg_processed); @@ -1408,11 +1727,6 @@ index 5c9e7791a12..91258c925a8 100644 + +#else alignment = MIN (MAX (alignment, PARM_BOUNDARY), STACK_BOUNDARY); - if (abi_break & warn_psabi) - { -@@ -7673,6 +7915,44 @@ aarch64_function_arg_boundary (machine_mode mode, const_tree type) - } - return alignment; +#endif +} @@ -1455,7 +1769,7 @@ index 5c9e7791a12..91258c925a8 100644 } /* Implement TARGET_GET_RAW_RESULT_MODE and TARGET_GET_RAW_ARG_MODE. */ -@@ -10848,6 +11128,7 @@ aarch64_classify_address (struct aarch64_address_info *info, +@@ -11030,6 +11306,7 @@ aarch64_classify_address (struct aarch64_address_info *info, /* load literal: pc-relative constant pool entry. Only supported for SI mode or larger. */ info->type = ADDRESS_SYMBOLIC; @@ -1463,7 +1777,7 @@ index 5c9e7791a12..91258c925a8 100644 if (!load_store_pair_p && GET_MODE_SIZE (mode).is_constant (&const_size) -@@ -10855,6 +11136,7 @@ aarch64_classify_address (struct aarch64_address_info *info, +@@ -11037,6 +11314,7 @@ aarch64_classify_address (struct aarch64_address_info *info, { poly_int64 offset; rtx sym = strip_offset_and_salt (x, &offset); @@ -1471,7 +1785,7 @@ index 5c9e7791a12..91258c925a8 100644 return ((LABEL_REF_P (sym) || (SYMBOL_REF_P (sym) && CONSTANT_POOL_ADDRESS_P (sym) -@@ -10872,10 +11154,13 @@ aarch64_classify_address (struct aarch64_address_info *info, +@@ -11054,10 +11332,13 @@ aarch64_classify_address (struct aarch64_address_info *info, poly_int64 offset; HOST_WIDE_INT const_offset; rtx sym = strip_offset_and_salt (info->offset, &offset); @@ -1486,7 +1800,7 @@ index 5c9e7791a12..91258c925a8 100644 { /* The symbol and offset must be aligned to the access size. */ unsigned int align; -@@ -10925,6 +11210,55 @@ aarch64_address_valid_for_prefetch_p (rtx x, bool strict_p) +@@ -11107,6 +11388,55 @@ aarch64_address_valid_for_prefetch_p (rtx x, bool strict_p) if (!res) return false; @@ -1542,7 +1856,7 @@ index 5c9e7791a12..91258c925a8 100644 /* ... except writeback forms. */ return addr.type != ADDRESS_REG_WB; } -@@ -11609,6 +11943,144 @@ sizetochar (int size) +@@ -11820,6 +12150,144 @@ sizetochar (int size) } } @@ -1687,7 +2001,7 @@ index 5c9e7791a12..91258c925a8 100644 /* Print operand X to file F in a target specific manner according to CODE. The acceptable formatting commands given by CODE are: 'c': An integer or symbol address without a preceding # -@@ -11677,6 +12149,12 @@ aarch64_print_operand (FILE *f, rtx x, int code) +@@ -11888,6 +12356,12 @@ aarch64_print_operand (FILE *f, rtx x, int code) } break; @@ -1700,7 +2014,7 @@ index 5c9e7791a12..91258c925a8 100644 case 'e': { x = unwrap_const_vec_duplicate (x); -@@ -12000,7 +12478,7 @@ aarch64_print_operand (FILE *f, rtx x, int code) +@@ -12211,7 +12685,7 @@ aarch64_print_operand (FILE *f, rtx x, int code) case 'A': if (GET_CODE (x) == HIGH) x = XEXP (x, 0); @@ -1709,7 +2023,7 @@ index 5c9e7791a12..91258c925a8 100644 switch (aarch64_classify_symbolic_expression (x)) { case SYMBOL_SMALL_GOT_4G: -@@ -12031,9 +12509,29 @@ aarch64_print_operand (FILE *f, rtx x, int code) +@@ -12242,9 +12716,29 @@ aarch64_print_operand (FILE *f, rtx x, int code) break; } output_addr_const (asm_out_file, x); @@ -1739,7 +2053,7 @@ index 5c9e7791a12..91258c925a8 100644 switch (aarch64_classify_symbolic_expression (x)) { case SYMBOL_SMALL_GOT_4G: -@@ -12071,10 +12569,12 @@ aarch64_print_operand (FILE *f, rtx x, int code) +@@ -12282,10 +12776,12 @@ aarch64_print_operand (FILE *f, rtx x, int code) default: break; } @@ -1752,7 +2066,7 @@ index 5c9e7791a12..91258c925a8 100644 switch (aarch64_classify_symbolic_expression (x)) { case SYMBOL_TLSLE24: -@@ -12083,6 +12583,7 @@ aarch64_print_operand (FILE *f, rtx x, int code) +@@ -12294,6 +12790,7 @@ aarch64_print_operand (FILE *f, rtx x, int code) default: break; } @@ -1760,7 +2074,7 @@ index 5c9e7791a12..91258c925a8 100644 output_addr_const (asm_out_file, x); break; -@@ -12232,8 +12733,14 @@ aarch64_print_address_internal (FILE *f, machine_mode mode, rtx x, +@@ -12443,8 +12940,14 @@ aarch64_print_address_internal (FILE *f, machine_mode mode, rtx x, break; case ADDRESS_LO_SUM: @@ -1775,7 +2089,7 @@ index 5c9e7791a12..91258c925a8 100644 asm_fprintf (f, "]"); return true; -@@ -12703,6 +13210,8 @@ aarch64_asm_output_labelref (FILE* f, const char *name) +@@ -12942,6 +13445,8 @@ aarch64_asm_output_labelref (FILE* f, const char *name) asm_fprintf (f, "%U%s", name); } @@ -1784,7 +2098,7 @@ index 5c9e7791a12..91258c925a8 100644 static void aarch64_elf_asm_constructor (rtx symbol, int priority) { -@@ -12742,6 +13251,7 @@ aarch64_elf_asm_destructor (rtx symbol, int priority) +@@ -12981,6 +13486,7 @@ aarch64_elf_asm_destructor (rtx symbol, int priority) assemble_aligned_integer (POINTER_BYTES, symbol); } } @@ -1792,7 +2106,19 @@ index 5c9e7791a12..91258c925a8 100644 const char* aarch64_output_casesi (rtx *operands) -@@ -15048,15 +15558,17 @@ aarch64_init_builtins () +@@ -13084,7 +13590,11 @@ aarch64_select_rtx_section (machine_mode mode, + if (aarch64_can_use_per_function_literal_pools_p ()) + return function_section (current_function_decl); + ++#ifdef TARGET_MACHO ++ return machopic_select_rtx_section (mode, x, align); ++#else + return default_elf_select_rtx_section (mode, x, align); ++#endif + } + + /* Implement ASM_OUTPUT_POOL_EPILOGUE. */ +@@ -15308,15 +15818,17 @@ aarch64_init_builtins () { aarch64_general_init_builtins (); aarch64_sve::init_builtins (); @@ -1813,7 +2139,7 @@ index 5c9e7791a12..91258c925a8 100644 unsigned int code = DECL_MD_FUNCTION_CODE (fndecl); unsigned int subcode = code >> AARCH64_BUILTIN_SHIFT; tree type = TREE_TYPE (TREE_TYPE (fndecl)); -@@ -18326,10 +18838,14 @@ initialize_aarch64_code_model (struct gcc_options *opts) +@@ -18500,10 +19012,14 @@ initialize_aarch64_code_model (struct gcc_options *opts) } break; case AARCH64_CMODEL_LARGE: @@ -1830,7 +2156,7 @@ index 5c9e7791a12..91258c925a8 100644 sorry ("code model %qs not supported in ilp32 mode", "large"); break; case AARCH64_CMODEL_TINY_PIC: -@@ -19252,7 +19768,9 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) +@@ -19389,7 +19905,9 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) case AARCH64_CMODEL_SMALL_SPIC: case AARCH64_CMODEL_SMALL_PIC: case AARCH64_CMODEL_SMALL: @@ -1841,7 +2167,7 @@ index 5c9e7791a12..91258c925a8 100644 default: gcc_unreachable (); -@@ -19288,10 +19806,22 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) +@@ -19425,10 +19943,22 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) return SYMBOL_TINY_ABSOLUTE; @@ -1865,7 +2191,7 @@ index 5c9e7791a12..91258c925a8 100644 if ((flag_pic || SYMBOL_REF_WEAK (x)) && !aarch64_symbol_binds_local_p (x)) return aarch64_cmodel == AARCH64_CMODEL_SMALL_SPIC -@@ -19303,7 +19833,8 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) +@@ -19440,7 +19970,8 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset) || offset_within_block_p (x, offset))) return SYMBOL_FORCE_TO_MEM; @@ -1875,7 +2201,7 @@ index 5c9e7791a12..91258c925a8 100644 case AARCH64_CMODEL_LARGE: /* This is alright even in PIC code as the constant -@@ -19433,7 +19964,10 @@ static GTY(()) tree va_list_type; +@@ -19570,7 +20101,10 @@ static GTY(()) tree va_list_type; void *__vr_top; int __gr_offs; int __vr_offs; @@ -1887,7 +2213,7 @@ index 5c9e7791a12..91258c925a8 100644 static tree aarch64_build_builtin_va_list (void) -@@ -19441,6 +19975,13 @@ aarch64_build_builtin_va_list (void) +@@ -19578,6 +20112,13 @@ aarch64_build_builtin_va_list (void) tree va_list_name; tree f_stack, f_grtop, f_vrtop, f_groff, f_vroff; @@ -1901,7 +2227,7 @@ index 5c9e7791a12..91258c925a8 100644 /* Create the type. */ va_list_type = lang_hooks.types.make_type (RECORD_TYPE); /* Give it the required name. */ -@@ -19512,6 +20053,13 @@ aarch64_expand_builtin_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED) +@@ -19649,6 +20190,13 @@ aarch64_expand_builtin_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED) int vr_save_area_size = cfun->va_list_fpr_size; int vr_offset; @@ -1915,7 +2241,7 @@ index 5c9e7791a12..91258c925a8 100644 cum = &crtl->args.info; if (cfun->va_list_gpr_size) gr_save_area_size = MIN ((NUM_ARG_REGS - cum->aapcs_ncrn) * UNITS_PER_WORD, -@@ -19602,6 +20150,9 @@ aarch64_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p, +@@ -19739,6 +20287,9 @@ aarch64_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p, HOST_WIDE_INT size, rsize, adjust, align; tree t, u, cond1, cond2; @@ -1925,7 +2251,7 @@ index 5c9e7791a12..91258c925a8 100644 indirect_p = pass_va_arg_by_reference (type); if (indirect_p) type = build_pointer_type (type); -@@ -19786,8 +20337,18 @@ aarch64_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p, +@@ -19929,8 +20480,18 @@ aarch64_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p, field_ptr_t = double_ptr_type_node; break; case E_TFmode: @@ -1944,9 +2270,9 @@ index 5c9e7791a12..91258c925a8 100644 + field_ptr_t = long_double_ptr_type_node; + } break; - case E_HFmode: - field_t = aarch64_fp16_type_node; -@@ -19858,6 +20419,9 @@ aarch64_setup_incoming_varargs (cumulative_args_t cum_v, + case E_SDmode: + field_t = dfloat32_type_node; +@@ -20013,6 +20574,9 @@ aarch64_setup_incoming_varargs (cumulative_args_t cum_v, int gr_saved = cfun->va_list_gpr_size; int vr_saved = cfun->va_list_fpr_size; @@ -1956,7 +2282,7 @@ index 5c9e7791a12..91258c925a8 100644 /* The caller has advanced CUM up to, but not beyond, the last named argument. Advance a local copy of CUM past the last "real" named argument, to find out how many registers are left over. */ -@@ -20685,6 +21249,12 @@ aarch64_autovectorize_vector_modes (vector_modes *modes, bool) +@@ -20845,6 +21409,12 @@ aarch64_autovectorize_vector_modes (vector_modes *modes, bool) static const char * aarch64_mangle_type (const_tree type) { @@ -1969,18 +2295,18 @@ index 5c9e7791a12..91258c925a8 100644 /* The AArch64 ABI documents say that "__va_list" has to be mangled as if it is in the "std" namespace. */ if (lang_hooks.types_compatible_p (CONST_CAST_TREE (type), va_list_type)) -@@ -20699,6 +21269,10 @@ aarch64_mangle_type (const_tree type) +@@ -20861,6 +21431,10 @@ aarch64_mangle_type (const_tree type) return "Dh"; } -+ /* TFmode is __float128 for Darwin. */ -+ if (TARGET_MACHO && TYPE_MODE (type) == TFmode) ++ /* __float128 */ ++ if (TYPE_MODE (type) == TFmode) + return "g"; + /* Mangle AArch64-specific internal types. TYPE_NAME is non-NULL_TREE for builtin types. */ if (TYPE_NAME (type) != NULL) -@@ -21389,7 +21963,8 @@ aarch64_mov_operand_p (rtx x, machine_mode mode) +@@ -21554,7 +22128,8 @@ aarch64_mov_operand_p (rtx x, machine_mode mode) /* GOT accesses are valid moves. */ if (SYMBOL_REF_P (x) @@ -1990,7 +2316,7 @@ index 5c9e7791a12..91258c925a8 100644 return true; if (SYMBOL_REF_P (x) && mode == DImode && CONSTANT_ADDRESS_P (x)) -@@ -22549,7 +23124,9 @@ aarch64_declare_function_name (FILE *stream, const char* name, +@@ -22746,7 +23321,9 @@ aarch64_declare_function_name (FILE *stream, const char* name, aarch64_asm_output_variant_pcs (stream, fndecl, name); /* Don't forget the type directive for ELF. */ @@ -2000,7 +2326,7 @@ index 5c9e7791a12..91258c925a8 100644 ASM_OUTPUT_LABEL (stream, name); cfun->machine->label_is_assembled = true; -@@ -22584,12 +23161,17 @@ aarch64_print_patchable_function_entry (FILE *file, +@@ -22807,12 +23384,17 @@ aarch64_output_patchable_area (unsigned int patch_area_size, bool record_p) /* Implement ASM_OUTPUT_DEF_FROM_DECLS. Output .variant_pcs for aliases. */ void @@ -2019,7 +2345,7 @@ index 5c9e7791a12..91258c925a8 100644 } /* Implement ASM_OUTPUT_EXTERNAL. Output .variant_pcs for undefined -@@ -23213,6 +23795,16 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, +@@ -23436,6 +24018,16 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, } gcc_assert (CONST_INT_P (info.u.mov.value)); @@ -2036,7 +2362,7 @@ index 5c9e7791a12..91258c925a8 100644 if (which == AARCH64_CHECK_MOV) { -@@ -23221,16 +23813,16 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, +@@ -23444,16 +24036,16 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, ? "msl" : "lsl"); if (lane_count == 1) snprintf (templ, sizeof (templ), "%s\t%%d0, " HOST_WIDE_INT_PRINT_HEX, @@ -2056,7 +2382,7 @@ index 5c9e7791a12..91258c925a8 100644 } else { -@@ -23239,12 +23831,12 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, +@@ -23462,12 +24054,12 @@ aarch64_output_simd_mov_immediate (rtx const_vector, unsigned width, if (info.u.mov.shift) snprintf (templ, sizeof (templ), "%s\t%%0.%d%c, #" HOST_WIDE_INT_PRINT_DEC ", %s #%d", mnemonic, lane_count, @@ -2071,22 +2397,26 @@ index 5c9e7791a12..91258c925a8 100644 } return templ; } -@@ -26355,12 +26947,12 @@ aarch64_libgcc_floating_mode_supported_p (scalar_float_mode mode) +@@ -26664,7 +27256,8 @@ aarch64_libgcc_floating_mode_supported_p (scalar_float_mode mode) } /* Implement TARGET_SCALAR_MODE_SUPPORTED_P - return TRUE -- if MODE is HFmode, and punt to the generic implementation otherwise. */ -+ if MODE is HFmode, or TFmode on Mach-O, and punt to the generic implementation otherwise. */ +- if MODE is [BH]Fmode, and punt to the generic implementation otherwise. */ ++ if MODE is [BH]Fmode, or TFmode on Mach-O, and punt to the generic ++ implementation otherwise. */ static bool aarch64_scalar_mode_supported_p (scalar_mode mode) - { -- return (mode == HFmode -+ return (mode == HFmode || (mode == TFmode && TARGET_MACHO) +@@ -26672,7 +27265,7 @@ aarch64_scalar_mode_supported_p (scalar_mode mode) + if (DECIMAL_FLOAT_MODE_P (mode)) + return default_decimal_float_supported_p (); + +- return ((mode == HFmode || mode == BFmode) ++ return ((mode == HFmode || mode == BFmode || (mode == TFmode && TARGET_MACHO)) ? true : default_scalar_mode_supported_p (mode)); } -@@ -27118,19 +27710,37 @@ aarch64_sls_emit_shared_blr_thunks (FILE *out_file) +@@ -27402,19 +27995,37 @@ aarch64_sls_emit_shared_blr_thunks (FILE *out_file) continue; const char *name = indirect_symbol_names[regnum]; @@ -2127,7 +2457,7 @@ index 5c9e7791a12..91258c925a8 100644 } } -@@ -27323,6 +27933,15 @@ aarch64_run_selftests (void) +@@ -27607,6 +28218,15 @@ aarch64_run_selftests (void) #undef TARGET_ASM_ALIGNED_SI_OP #define TARGET_ASM_ALIGNED_SI_OP "\t.word\t" @@ -2143,7 +2473,7 @@ index 5c9e7791a12..91258c925a8 100644 #undef TARGET_ASM_CAN_OUTPUT_MI_THUNK #define TARGET_ASM_CAN_OUTPUT_MI_THUNK \ hook_bool_const_tree_hwi_hwi_const_tree_true -@@ -27409,6 +28028,12 @@ aarch64_run_selftests (void) +@@ -27693,6 +28313,12 @@ aarch64_run_selftests (void) #undef TARGET_FUNCTION_ARG_BOUNDARY #define TARGET_FUNCTION_ARG_BOUNDARY aarch64_function_arg_boundary @@ -2156,7 +2486,7 @@ index 5c9e7791a12..91258c925a8 100644 #undef TARGET_FUNCTION_ARG_PADDING #define TARGET_FUNCTION_ARG_PADDING aarch64_function_arg_padding -@@ -27736,7 +28361,7 @@ aarch64_libgcc_floating_mode_supported_p +@@ -28017,7 +28643,7 @@ aarch64_libgcc_floating_mode_supported_p /* The architecture reserves bits 0 and 1 so use bit 2 for descriptors. */ #undef TARGET_CUSTOM_FUNCTION_DESCRIPTORS @@ -2166,12 +2496,12 @@ index 5c9e7791a12..91258c925a8 100644 #undef TARGET_HARD_REGNO_NREGS #define TARGET_HARD_REGNO_NREGS aarch64_hard_regno_nregs diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h -index 359b6e8561f..db5fe441b36 100644 +index 73b09e20508..d11c0ba21b4 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h -@@ -58,6 +58,10 @@ - #define TARGET_SIMD (!TARGET_GENERAL_REGS_ONLY && AARCH64_ISA_SIMD) - #define TARGET_FLOAT (!TARGET_GENERAL_REGS_ONLY && AARCH64_ISA_FP) +@@ -65,6 +65,10 @@ + #define TARGET_SIMD (AARCH64_ISA_SIMD) + #define TARGET_FLOAT (AARCH64_ISA_FP) +/* If this is non-zero then generated code of the object format, ABI and + assembler syntax used by Darwin (Mach-O) platforms. */ @@ -2180,7 +2510,7 @@ index 359b6e8561f..db5fe441b36 100644 #define UNITS_PER_WORD 8 #define UNITS_PER_VREG 16 -@@ -135,6 +139,12 @@ +@@ -142,6 +146,12 @@ /* Heap alignment (same as BIGGEST_ALIGNMENT and STACK_BOUNDARY). */ #define MALLOC_ABI_ALIGNMENT 128 @@ -2193,7 +2523,7 @@ index 359b6e8561f..db5fe441b36 100644 /* Defined by the ABI */ #define WCHAR_TYPE "unsigned int" #define WCHAR_TYPE_SIZE 32 -@@ -1025,6 +1035,24 @@ typedef struct +@@ -934,6 +944,24 @@ typedef struct aapcs_reg == NULL_RTX. */ int aapcs_stack_size; /* The total size (in words, per 8 byte) of the stack arg area so far. */ @@ -2218,7 +2548,7 @@ index 359b6e8561f..db5fe441b36 100644 bool silent_p; /* True if we should act silently, rather than raise an error for invalid calls. */ } CUMULATIVE_ARGS; -@@ -1309,8 +1337,13 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); +@@ -1232,8 +1260,13 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv); #define ASM_CPU_SPEC \ MCPU_TO_MARCH_SPEC @@ -2233,8 +2563,8 @@ index 359b6e8561f..db5fe441b36 100644 #define ASM_OUTPUT_POOL_EPILOGUE aarch64_asm_output_pool_epilogue -@@ -1324,6 +1357,10 @@ extern GTY(()) tree aarch64_fp16_ptr_type_node; - extern GTY(()) tree aarch64_bf16_type_node; +@@ -1246,6 +1279,10 @@ extern GTY(()) tree aarch64_fp16_ptr_type_node; + bfloat16_type_node. Defined in aarch64-builtins.cc. */ extern GTY(()) tree aarch64_bf16_ptr_type_node; +/* A pointer to the user-visible __float128 (on Mach-O). Defined in @@ -2245,18 +2575,18 @@ index 359b6e8561f..db5fe441b36 100644 So in order to unwind a function using a frame pointer, the very first function that is unwound must save the frame pointer. That way the frame diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md -index 34b8059b45b..c356d3048b5 100644 +index 36d0bb3f718..454c0fc1a8e 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md -@@ -303,6 +303,7 @@ - UNSPEC_TAG_SPACE ; Translate address to MTE tag address space. +@@ -304,6 +304,7 @@ UNSPEC_LD1RO UNSPEC_SALT_ADDR + UNSPECV_PATCHABLE_AREA + UNSPEC_MACHOPIC_OFFSET ]) (define_c_enum "unspecv" [ -@@ -849,6 +850,37 @@ +@@ -850,6 +851,37 @@ [(set_attr "type" "load_4")] ) @@ -2294,7 +2624,7 @@ index 34b8059b45b..c356d3048b5 100644 (define_insn "trap" [(trap_if (const_int 1) (const_int 8))] "" -@@ -1286,7 +1318,7 @@ +@@ -1304,7 +1336,7 @@ ldr\\t%s0, %1 str\\t%w1, %0 str\\t%s1, %0 @@ -2303,7 +2633,7 @@ index 34b8059b45b..c356d3048b5 100644 adr\\t%x0, %c1 adrp\\t%x0, %A1 fmov\\t%s0, %w1 -@@ -1325,7 +1357,7 @@ +@@ -1342,7 +1374,7 @@ ldr\\t%d0, %1 str\\t%x1, %0 str\\t%d1, %0 @@ -2312,7 +2642,7 @@ index 34b8059b45b..c356d3048b5 100644 adr\\t%x0, %c1 adrp\\t%x0, %A1 fmov\\t%d0, %x1 -@@ -6857,7 +6889,10 @@ +@@ -7019,7 +7051,10 @@ (lo_sum:P (match_operand:P 1 "register_operand" "r") (match_operand 2 "aarch64_valid_symref" "S")))] "" @@ -2325,10 +2655,10 @@ index 34b8059b45b..c356d3048b5 100644 ) diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt -index 92220b26ee2..15ec719ca2d 100644 +index 1d7967db9c0..cc97d7263ba 100644 --- a/gcc/config/aarch64/aarch64.opt +++ b/gcc/config/aarch64/aarch64.opt -@@ -152,6 +152,13 @@ Enum(aarch64_abi) String(ilp32) Value(AARCH64_ABI_ILP32) +@@ -158,6 +158,13 @@ Enum(aarch64_abi) String(ilp32) Value(AARCH64_ABI_ILP32) EnumValue Enum(aarch64_abi) String(lp64) Value(AARCH64_ABI_LP64) @@ -2343,10 +2673,10 @@ index 92220b26ee2..15ec719ca2d 100644 Target Save Var(pcrelative_literal_loads) Init(2) Save PC relative literal loads. diff --git a/gcc/config/aarch64/constraints.md b/gcc/config/aarch64/constraints.md -index ee7587cca16..cb73a2daae8 100644 +index 5b20abc27e5..9c6a631c6fb 100644 --- a/gcc/config/aarch64/constraints.md +++ b/gcc/config/aarch64/constraints.md -@@ -158,7 +158,9 @@ +@@ -168,7 +168,9 @@ A constraint that matches a small GOT access." (and (match_code "const,symbol_ref") (match_test "aarch64_classify_symbolic_expression (op) @@ -2357,7 +2687,7 @@ index ee7587cca16..cb73a2daae8 100644 (define_constraint "Uss" "@internal -@@ -490,6 +492,11 @@ +@@ -505,6 +507,11 @@ An address valid for a prefetch instruction." (match_test "aarch64_address_valid_for_prefetch_p (op, true)")) @@ -2371,10 +2701,10 @@ index ee7587cca16..cb73a2daae8 100644 A constraint that matches an immediate offset valid for SVE LD1B diff --git a/gcc/config/aarch64/darwin.h b/gcc/config/aarch64/darwin.h new file mode 100644 -index 00000000000..2a855c11efa +index 00000000000..5609c569dc1 --- /dev/null +++ b/gcc/config/aarch64/darwin.h -@@ -0,0 +1,280 @@ +@@ -0,0 +1,279 @@ +/* Target definitions for Arm64/Aarch64 running on macOS/iOS. + +Copyright The GNU Toolchain Authors. @@ -2589,7 +2919,7 @@ index 00000000000..2a855c11efa +/* Darwin has experimental support for section anchors on aarch64*; it is + not enabled by default (the -fsection-anchors is required). */ + -+#undef TARGET_ASM_OUTPUT_ANCHOR ++#undef TARGET_ASM_OUTPUT_ANCHOR +#define TARGET_ASM_OUTPUT_ANCHOR darwin_asm_output_anchor + +#undef TARGET_USE_ANCHORS_FOR_SYMBOL_P @@ -2654,9 +2984,8 @@ index 00000000000..2a855c11efa +#define CLEAR_INSN_CACHE(beg, end) \ + extern void sys_icache_invalidate(void *start, size_t len); \ + sys_icache_invalidate ((beg), (size_t)((end)-(beg))) -+ diff --git a/gcc/config/aarch64/falkor-tag-collision-avoidance.cc b/gcc/config/aarch64/falkor-tag-collision-avoidance.cc -index 5f198290568..610838049e5 100644 +index 39e3f5c2d1b..78790cd1d15 100644 --- a/gcc/config/aarch64/falkor-tag-collision-avoidance.cc +++ b/gcc/config/aarch64/falkor-tag-collision-avoidance.cc @@ -740,7 +740,7 @@ dump_insn_list (const rtx &t, const insn_info_list_t &insn_info, @@ -2669,10 +2998,10 @@ index 5f198290568..610838049e5 100644 for (unsigned i = 0; i < insn_info.length (); i++) dump_insn_slim (dump_file, insn_info[i]->insn); diff --git a/gcc/config/aarch64/predicates.md b/gcc/config/aarch64/predicates.md -index c308015ac2c..cd88f93ca2d 100644 +index 3f5f4df8c46..4c3498dfe2c 100644 --- a/gcc/config/aarch64/predicates.md +++ b/gcc/config/aarch64/predicates.md -@@ -261,9 +261,24 @@ +@@ -277,9 +277,24 @@ (define_predicate "aarch64_prefetch_operand" (match_test "aarch64_address_valid_for_prefetch_p (op, false)")) @@ -2699,7 +3028,7 @@ index c308015ac2c..cd88f93ca2d 100644 }) diff --git a/gcc/config/aarch64/t-aarch64-darwin b/gcc/config/aarch64/t-aarch64-darwin new file mode 100644 -index 00000000000..a8bfcffad78 +index 00000000000..9754e87ebcf --- /dev/null +++ b/gcc/config/aarch64/t-aarch64-darwin @@ -0,0 +1,25 @@ @@ -2725,11 +3054,11 @@ index 00000000000..a8bfcffad78 +LIB1ASMSRC = aarch64/lib1funcs.asm +LIB1ASMFUNCS = _aarch64_sync_cache_range + -+# FIXME - figure out what multilib provisions we should make for ++# FIXME - figure out what multilib provisions we should make for +# a) arm64e +# b) arm64_32 diff --git a/gcc/config/darwin-driver.cc b/gcc/config/darwin-driver.cc -index 00287f3d5ec..6df85f57bb4 100644 +index 9c1dcc3d794..a4d7cfe7376 100644 --- a/gcc/config/darwin-driver.cc +++ b/gcc/config/darwin-driver.cc @@ -268,14 +268,21 @@ darwin_driver_init (unsigned int *decoded_options_count, @@ -2868,7 +3197,7 @@ index 00287f3d5ec..6df85f57bb4 100644 +#endif } diff --git a/gcc/config/darwin.cc b/gcc/config/darwin.cc -index f065a13d73d..7cd684c6abe 100644 +index ced2f7e40a6..0915548477e 100644 --- a/gcc/config/darwin.cc +++ b/gcc/config/darwin.cc @@ -118,7 +118,7 @@ static bool ld_init_term_start_labels = false; @@ -2896,16 +3225,7 @@ index f065a13d73d..7cd684c6abe 100644 int machopic_operand_p (rtx op) -@@ -1936,6 +1938,8 @@ darwin_label_is_anonymous_local_objc_name (const char *name) - } - else if (startswith ((const char *)p, "ClassMethods")) - return false; -+ else if (startswith ((const char *)p, "ClassProtocols")) -+ return false; - else if (startswith ((const char *)p, "Instance")) - { - if (p[8] == 'I' || p[8] == 'M') -@@ -2238,6 +2242,8 @@ darwin_emit_except_table_label (FILE *file) +@@ -2240,6 +2242,8 @@ darwin_emit_except_table_label (FILE *file) rtx darwin_make_eh_symbol_indirect (rtx orig, bool ARG_UNUSED (pubvis)) { @@ -2914,7 +3234,7 @@ index f065a13d73d..7cd684c6abe 100644 if (DARWIN_PPC == 0 && TARGET_64BIT) return orig; -@@ -3058,7 +3064,12 @@ darwin_file_end (void) +@@ -3060,7 +3064,12 @@ darwin_file_end (void) fprintf (asm_out_file, "\t.long\t0\n\t.long\t%u\n", flags); } @@ -2928,7 +3248,7 @@ index f065a13d73d..7cd684c6abe 100644 { /* These sections are only used for kernel code. */ diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h -index 51e257dc698..13ba6e61474 100644 +index 1b538c73593..7fb3ec40755 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -42,6 +42,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -2939,9 +3259,9 @@ index 51e257dc698..13ba6e61474 100644 #define OBJECT_FORMAT_MACHO 1 -@@ -296,6 +297,31 @@ extern GTY(()) int darwin_ms_struct; +@@ -303,6 +304,31 @@ extern GTY(()) int darwin_ms_struct; #define DARWIN_CC1_SPEC \ - "%= 10.6, the unwinder *still* comes from libSystem and -- we find the emutls impl from lemutls_w. In either case, the builtins etc. -- are linked from -lgcc. -- -- When we have specified shared-libgcc or any case that might require -- exceptions, we pull the libgcc content (including emulated tls) from -- -lgcc_s.1 in GCC and the unwinder from /usr/lib/libgcc_s.1 for < 10.6 and -- libSystem for >= 10.6 respectively. -- Otherwise, we just link the emutls/builtins from convenience libs. -- -- If we need exceptions, prior to 10.3.9, then we have to link the static -- eh lib, since there's no shared version on the system. -- -- In all cases, libgcc_s.1 will be installed with the compiler, or any app -- built using it, so we can link the builtins and emutls shared on all. -- - We have to work around that DYLD_XXXX are disabled in macOS 10.11+ which - means that any bootstrap trying to use a shared libgcc with a bumped SO- - name will fail. This means that we do not accept shared libgcc for these -- versions. -+ versions, unless we have embedded run paths enabled, in which case the -+ compiler will add the appropriate path to find the library. -+ -+ For -static-libgcc: < 10.6, use the unwinder in libgcc_eh (and find -+ the emultls impl. there too). - - For -static-libgcc: >= 10.6, the unwinder *still* comes from libSystem and - we find the emutls impl from lemutls_w. In either case, the builtins etc. - are linked from -lgcc. --> -+ - Otherwise, we just link the shared version of gcc_s.1.1 and pick up - exceptions: - * Prior to 10.3.9, then we have to link the static eh lib, since there -@@ -502,6 +515,10 @@ extern GTY(()) int darwin_ms_struct; - - In all cases, libgcc_s.1.1 will be installed with the compiler, or any app - built using it, so we can link the builtins and emutls shared on all. -+ -+ On most Darwin systems (other than Arm64) we will also install a legacy -+ support libgcc_s.1.dylib to support executables linked with libgcc_ext by -+ earlier GCC versions. - */ - #undef REAL_LIBGCC_SPEC - #define REAL_LIBGCC_SPEC \ -@@ -509,8 +526,7 @@ extern GTY(()) int darwin_ms_struct; +@@ -511,8 +539,7 @@ extern GTY(()) int darwin_ms_struct; %:version-compare(!> 10.6 mmacosx-version-min= -lgcc_eh) \ %:version-compare(>= 10.6 mmacosx-version-min= -lemutls_w); \ shared-libgcc|fexceptions|fobjc-exceptions|fgnu-runtime: \ @@ -3044,7 +3312,7 @@ index 51e257dc698..13ba6e61474 100644 %:version-compare(!> 10.3.9 mmacosx-version-min= -lgcc_eh) \ %:version-compare(>< 10.3.9 10.5 mmacosx-version-min= -lgcc_s.10.4) \ %:version-compare(>< 10.5 10.6 mmacosx-version-min= -lgcc_s.10.5); \ -@@ -545,7 +561,8 @@ extern GTY(()) int darwin_ms_struct; +@@ -547,7 +574,8 @@ extern GTY(()) int darwin_ms_struct; { "darwin_crt2", DARWIN_CRT2_SPEC }, \ { "darwin_crt3", DARWIN_CRT3_SPEC }, \ { "darwin_dylib1", DARWIN_DYLIB1_SPEC }, \ @@ -3054,7 +3322,7 @@ index 51e257dc698..13ba6e61474 100644 #define DARWIN_CRT1_SPEC \ "%:version-compare(!> 10.5 mmacosx-version-min= -lcrt1.o) \ -@@ -571,6 +588,17 @@ extern GTY(()) int darwin_ms_struct; +@@ -573,6 +601,17 @@ extern GTY(()) int darwin_ms_struct; "%{!static:%:version-compare(< 10.6 mmacosx-version-min= -lbundle1.o) \ %{fgnu-tm: -lcrttms.o}}" @@ -3073,10 +3341,10 @@ index 51e257dc698..13ba6e61474 100644 /* Emit macosx version (but only major). */ #define ASM_MMACOSX_VERSION_MIN_SPEC \ diff --git a/gcc/config/darwin.opt b/gcc/config/darwin.opt -index cc7d14c2e4d..b1cb8464d57 100644 +index d655aaef2fb..ff624ffd82a 100644 --- a/gcc/config/darwin.opt +++ b/gcc/config/darwin.opt -@@ -237,6 +237,10 @@ nodefaultexport +@@ -241,6 +241,10 @@ nodefaultexport Driver RejectNegative Do not add a default symbol exports to modules or dynamic libraries. @@ -3088,7 +3356,7 @@ index cc7d14c2e4d..b1cb8464d57 100644 Driver RejectNegative (Obsolete after 10.3.9) Set MH_NOPREFIXBINDING, in an executable. diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h -index a55f6b2b874..36a32867281 100644 +index 588bd669bdd..b6c9a94c3a0 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -308,3 +308,10 @@ along with GCC; see the file COPYING3. If not see @@ -3103,10 +3371,10 @@ index a55f6b2b874..36a32867281 100644 + (!flag_off_stack_trampolines && !flag_trampolines) ? 1 : 0 + diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc -index 9dd9fa68722..5cd4b5c0592 100644 +index a551b8b9d9b..dd9f22b440f 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc -@@ -24698,7 +24698,7 @@ ix86_libgcc_floating_mode_supported_p +@@ -25189,7 +25189,7 @@ ix86_libgcc_floating_mode_supported_p #define TARGET_HARD_REGNO_SCRATCH_OK ix86_hard_regno_scratch_ok #undef TARGET_CUSTOM_FUNCTION_DESCRIPTORS @@ -3116,10 +3384,10 @@ index 9dd9fa68722..5cd4b5c0592 100644 #undef TARGET_ADDR_SPACE_ZERO_ADDRESS_VALID #define TARGET_ADDR_SPACE_ZERO_ADDRESS_VALID ix86_addr_space_zero_address_valid diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h -index 363082ba47b..5f56d7abf65 100644 +index 27b9783cae8..f97d3027da3 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h -@@ -746,6 +746,12 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); +@@ -754,6 +754,12 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); /* Minimum allocation boundary for the code of a function. */ #define FUNCTION_BOUNDARY 8 @@ -3133,18 +3401,24 @@ index 363082ba47b..5f56d7abf65 100644 #define TARGET_PTRMEMFUNC_VBIT_LOCATION ptrmemfunc_vbit_in_pfn diff --git a/gcc/configure b/gcc/configure -index 5ce0557719a..dbc127c59cb 100755 +index c7b26d1927d..f4bd9c5d5f1 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -634,6 +634,7 @@ LIBOBJS +@@ -632,10 +632,10 @@ ac_includes_default="\ + ac_subst_vars='LTLIBOBJS + LIBOBJS CET_HOST_FLAGS - NO_PIE_FLAG - NO_PIE_CFLAGS -+enable_pie_tools - enable_default_pie +-NO_PIE_FLAG +-NO_PIE_CFLAGS +-enable_default_pie ++LD_PICFLAG PICFLAG ++enable_default_pie ++enable_host_pie enable_host_shared -@@ -740,6 +741,8 @@ ORIGINAL_PLUGIN_LD_FOR_TARGET + enable_plugin + pluginlibs +@@ -740,6 +740,8 @@ ORIGINAL_PLUGIN_LD_FOR_TARGET gcc_cv_ld ORIGINAL_AS_FOR_TARGET gcc_cv_as @@ -3153,7 +3427,7 @@ index 5ce0557719a..dbc127c59cb 100755 enable_fast_install objdir OTOOL64 -@@ -1000,6 +1003,8 @@ enable_static +@@ -1003,6 +1005,8 @@ enable_static with_pic enable_fast_install enable_libtool_lock @@ -3162,15 +3436,15 @@ index 5ce0557719a..dbc127c59cb 100755 enable_ld enable_gold with_plugin_ld -@@ -1030,6 +1035,7 @@ with_linker_hash_style +@@ -1028,6 +1032,7 @@ enable_link_serialization + enable_version_specific_runtime_libs + enable_plugin + enable_host_shared ++enable_host_pie + enable_libquadmath_support + with_linker_hash_style with_diagnostics_color - with_diagnostics_urls - enable_default_pie -+enable_pie_tools - enable_cet - enable_s390_excess_float_precision - ' -@@ -1733,6 +1739,8 @@ Optional Features: +@@ -1736,6 +1741,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -3179,16 +3453,15 @@ index 5ce0557719a..dbc127c59cb 100755 --enable-ld[=ARG] build ld [ARG={default,yes,no}] --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-gnu-indirect-function -@@ -1790,6 +1798,8 @@ Optional Features: +@@ -1790,6 +1797,7 @@ Optional Features: + in a compiler-specific directory + --enable-plugin enable plugin support + --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE --disable-libquadmath-support disable libquadmath support for Fortran --enable-default-pie enable Position Independent Executable as default -+ --enable-pie-tools build Position Independent Executables for the -+ compilers and other tools - --enable-cet enable Intel CET in host libraries [default=auto] - --enable-s390-excess-float-precision - on s390 targets, evaluate float with double -@@ -1850,6 +1860,9 @@ Optional Packages: +@@ -1854,6 +1862,9 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -3198,26 +3471,70 @@ index 5ce0557719a..dbc127c59cb 100755 --with-plugin-ld=[ARG] specify the plugin linker --with-glibc-version=M.N assume GCC used with glibc version M.N or later -@@ -3766,15 +3779,24 @@ if test x${gcc_gxx_libcxx_include_dir} != x; then - $as_echo "#define ENABLE_STDLIB_OPTION 1" >>confdefs.h +@@ -3753,33 +3764,59 @@ gcc_gxx_libcxx_include_dir= + + # Check whether --with-gxx-libcxx-include-dir was given. + if test "${with_gxx_libcxx_include_dir+set}" = set; then : +- withval=$with_gxx_libcxx_include_dir; case "${withval}" in +-yes) as_fn_error $? "bad value ${withval} given for libc++ include directory" "$LINENO" 5 ;; +-no) ;; +-*) gcc_gxx_libcxx_include_dir=$with_gxx_libcxx_include_dir ;; +-esac ++ withval=$with_gxx_libcxx_include_dir; gcc_gxx_libcxx_include_dir=$with_gxx_libcxx_include_dir + fi - else -- $as_echo "#define ENABLE_STDLIB_OPTION 0" >>confdefs.h + ++# --with-gxx-libcxx-include-dir controls the enabling of the -stdlib option. ++# if --with-gxx-libcxx-include-dir is 'no' we disable the stdlib option. ++# if --with-gxx-libcxx-include-dir is 'yes' we enable the stdlib option and use ++# the default path within the installation. ++# if --with-gxx-libcxx-include-dir is unset we enable the stdlib option ++# based on the platform (to be available on platform versions where it is the ++# default for the system tools). We also use a default path within the compiler ++# install tree. ++# Otherwise, we use the path provided and enable the stdlib option. + # If both --with-sysroot and --with-gxx-libcxx-include-dir are passed, we + # check to see if the latter starts with the former and, upon success, compute + # gcc_gxx_libcxx_include_dir as relative to the sysroot. + gcc_gxx_libcxx_include_dir_add_sysroot=0 +- ++gcc_enable_stdlib_opt=0 + if test x${gcc_gxx_libcxx_include_dir} != x; then ++ if test x${gcc_gxx_libcxx_include_dir} = xno; then ++ # set defaults for the dir, but the option is disabled anyway. ++ gcc_gxx_libcxx_include_dir= ++ elif test x${gcc_gxx_libcxx_include_dir} = xyes; then ++ # set defaults for the dir, and enable. ++ gcc_gxx_libcxx_include_dir= ++ gcc_enable_stdlib_opt=1 ++ else ++ gcc_enable_stdlib_opt=1 ++ fi ++else + case $target in + *-darwin1[1-9]* | *-darwin2*) -+ # Default this on for Darwin versions which default to libcxx. -+ $as_echo "#define ENABLE_STDLIB_OPTION 1" >>confdefs.h - -+ ;; -+ *) -+ $as_echo "#define ENABLE_STDLIB_OPTION 0" >>confdefs.h -+ ++ # Default this on for Darwin versions which default to libcxx, ++ # and embed the path in the compiler install so that we get a ++ # self-contained toolchain. ++ gcc_enable_stdlib_opt=1 + ;; ++ *) ;; + esac - fi ++fi + +-$as_echo "#define ENABLE_STDLIB_OPTION 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define ENABLE_STDLIB_OPTION $gcc_enable_stdlib_opt ++_ACEOF + +-else +- $as_echo "#define ENABLE_STDLIB_OPTION 0" >>confdefs.h + +-fi -# ??? This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO. -+ ++# Sysroot behaviour as for gxx-include-dir if test x${gcc_gxx_libcxx_include_dir} = x; then ++ # default path,embedded in the compiler tree. + libcxx_incdir='include/c++/v1' if test x${enable_version_specific_runtime_libs} = xyes; then - gcc_gxx_libcxx_include_dir='${libsubdir}/libc++_include/c++/v1' @@ -3227,7 +3544,16 @@ index 5ce0557719a..dbc127c59cb 100755 if test x$host != x$target; then libcxx_incdir="$target_alias/$libcxx_incdir" fi -@@ -17867,6 +17889,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -16295,7 +16332,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -18000,6 +18037,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -3244,8 +3570,9 @@ index 5ce0557719a..dbc127c59cb 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -3253,15 +3580,16 @@ index 5ce0557719a..dbc127c59cb 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -3275,49 +3603,41 @@ index 5ce0557719a..dbc127c59cb 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -17884,10 +17947,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -18017,9 +18097,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -19673,7 +19745,7 @@ else +@@ -19825,7 +19909,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 19676 "configure" -+#line 19748 "configure" +-#line 19828 "configure" ++#line 19912 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -19779,7 +19851,7 @@ else +@@ -19931,7 +20015,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 19782 "configure" -+#line 19854 "configure" +-#line 19934 "configure" ++#line 20018 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -20655,6 +20727,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -20807,6 +20891,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -3334,8 +3654,9 @@ index 5ce0557719a..dbc127c59cb 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -3343,15 +3664,16 @@ index 5ce0557719a..dbc127c59cb 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -3365,38 +3687,31 @@ index 5ce0557719a..dbc127c59cb 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -20672,12 +20785,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -20824,12 +20951,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -23028,6 +23154,35 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -23200,6 +23335,35 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -3432,30 +3747,69 @@ index 5ce0557719a..dbc127c59cb 100755 # Identify the assembler which will work hand-in-glove with the newly # built GCC, so that we can examine its features. This is the assembler # which will be driven by the driver program. -@@ -32429,6 +32584,22 @@ $as_echo "#define ENABLE_DEFAULT_PIE 1" >>confdefs.h +@@ -32062,13 +32226,17 @@ fi + # Enable --enable-host-shared + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC +-else +- PICFLAG= ++ enableval=$enable_host_shared; fi -+# Check whether --enable-pie-tools was given; this is passed automatically -+# from the top level where it has already been validated. -+# Check whether --enable-pie-tools was given. -+if test "${enable_pie_tools+set}" = set; then : -+ enableval=$enable_pie_tools; enable_pie_tools=$enableval -+else -+ enable_pie_tools=no + ++# Enable --enable-host-pie ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; +fi + -+if test x$enable_pie_tools = xyes ; then -+ -+$as_echo "#define ENABLE_PIE_TOOLS 1" >>confdefs.h -+ + + + # Check whether --enable-libquadmath-support was given. +@@ -32222,10 +32390,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_c_no_fpie" >&5 + $as_echo "$gcc_cv_c_no_fpie" >&6; } +-if test "$gcc_cv_c_no_fpie" = "yes"; then +- NO_PIE_CFLAGS="-fno-PIE" +-fi +- + + # Check if -no-pie works. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -no-pie option" >&5 +@@ -32250,10 +32414,27 @@ rm -f core conftest.err conftest.$ac_objext \ + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_no_pie" >&5 + $as_echo "$gcc_cv_no_pie" >&6; } +-if test "$gcc_cv_no_pie" = "yes"; then +- NO_PIE_FLAG="-no-pie" ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++elif test x$gcc_cv_c_no_fpie = xyes; then ++ PICFLAG=-fno-PIE ++else ++ PICFLAG= + fi + ++if test x$enable_host_pie = xyes; then ++ LD_PICFLAG=-pie ++elif test x$gcc_cv_no_pie = xyes; then ++ LD_PICFLAG=-no-pie ++else ++ LD_PICFLAG= +fi + + - # Check if -fno-PIE works. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-PIE option" >&5 - $as_echo_n "checking for -fno-PIE option... " >&6; } -@@ -32966,6 +33137,10 @@ LTLIBOBJS=$ac_ltlibobjs ++ + + # Enable Intel CET on Intel CET enabled host if jit is enabled. + # Check whether --enable-cet was given. +@@ -32737,6 +32918,10 @@ LTLIBOBJS=$ac_ltlibobjs @@ -3467,27 +3821,68 @@ index 5ce0557719a..dbc127c59cb 100755 : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/gcc/configure.ac b/gcc/configure.ac -index 23bee7010a3..2d9159989e4 100644 +index 09082e8ccae..d181e41154c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -249,14 +249,22 @@ if test x${gcc_gxx_libcxx_include_dir} != x; then - AC_DEFINE(ENABLE_STDLIB_OPTION, 1, - [Define if the -stdlib= option should be enabled.]) +@@ -235,29 +235,54 @@ gcc_gxx_libcxx_include_dir= + AC_ARG_WITH(gxx-libcxx-include-dir, + [AS_HELP_STRING([--with-gxx-libcxx-include-dir=DIR], + [specifies directory to find libc++ header files])], +-[case "${withval}" in +-yes) AC_MSG_ERROR(bad value ${withval} given for libc++ include directory) ;; +-no) ;; +-*) gcc_gxx_libcxx_include_dir=$with_gxx_libcxx_include_dir ;; +-esac]) +- ++[gcc_gxx_libcxx_include_dir=$with_gxx_libcxx_include_dir]) ++ ++# --with-gxx-libcxx-include-dir controls the enabling of the -stdlib option. ++# if --with-gxx-libcxx-include-dir is 'no' we disable the stdlib option. ++# if --with-gxx-libcxx-include-dir is 'yes' we enable the stdlib option and use ++# the default path within the installation. ++# if --with-gxx-libcxx-include-dir is unset we enable the stdlib option ++# based on the platform (to be available on platform versions where it is the ++# default for the system tools). We also use a default path within the compiler ++# install tree. ++# Otherwise, we use the path provided and enable the stdlib option. + # If both --with-sysroot and --with-gxx-libcxx-include-dir are passed, we + # check to see if the latter starts with the former and, upon success, compute + # gcc_gxx_libcxx_include_dir as relative to the sysroot. + gcc_gxx_libcxx_include_dir_add_sysroot=0 +- ++gcc_enable_stdlib_opt=0 + if test x${gcc_gxx_libcxx_include_dir} != x; then +- AC_DEFINE(ENABLE_STDLIB_OPTION, 1, +- [Define if the -stdlib= option should be enabled.]) ++ if test x${gcc_gxx_libcxx_include_dir} = xno; then ++ # set defaults for the dir, but the option is disabled anyway. ++ gcc_gxx_libcxx_include_dir= ++ elif test x${gcc_gxx_libcxx_include_dir} = xyes; then ++ # set defaults for the dir, and enable. ++ gcc_gxx_libcxx_include_dir= ++ gcc_enable_stdlib_opt=1 ++ else ++ gcc_enable_stdlib_opt=1 ++ fi else - AC_DEFINE(ENABLE_STDLIB_OPTION, 0) + case $target in + *-darwin1[[1-9]]* | *-darwin2*) -+ # Default this on for Darwin versions which default to libcxx. -+ AC_DEFINE(ENABLE_STDLIB_OPTION, 1) -+ ;; -+ *) -+ AC_DEFINE(ENABLE_STDLIB_OPTION, 0) ++ # Default this on for Darwin versions which default to libcxx, ++ # and embed the path in the compiler install so that we get a ++ # self-contained toolchain. ++ gcc_enable_stdlib_opt=1 + ;; ++ *) ;; + esac fi -# ??? This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO. ++AC_DEFINE_UNQUOTED(ENABLE_STDLIB_OPTION, $gcc_enable_stdlib_opt, ++ [Define if the -stdlib= option should be enabled.]) + ++# Sysroot behaviour as for gxx-include-dir if test x${gcc_gxx_libcxx_include_dir} = x; then ++ # default path,embedded in the compiler tree. + libcxx_incdir='include/c++/v1' if test x${enable_version_specific_runtime_libs} = xyes; then - gcc_gxx_libcxx_include_dir='${libsubdir}/libc++_include/c++/v1' @@ -3497,7 +3892,7 @@ index 23bee7010a3..2d9159989e4 100644 if test x$host != x$target; then libcxx_incdir="$target_alias/$libcxx_incdir" fi -@@ -2559,6 +2567,21 @@ AC_PROG_LIBTOOL +@@ -2586,6 +2611,21 @@ AC_PROG_LIBTOOL AC_SUBST(objdir) AC_SUBST(enable_fast_install) @@ -3519,31 +3914,71 @@ index 23bee7010a3..2d9159989e4 100644 # Identify the assembler which will work hand-in-glove with the newly # built GCC, so that we can examine its features. This is the assembler # which will be driven by the driver program. -@@ -7646,6 +7669,19 @@ if test x$enable_default_pie = xyes ; then +@@ -7400,11 +7440,14 @@ fi + # Enable --enable-host-shared + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) ++ [build host code as shared libraries])]) + AC_SUBST(enable_host_shared) +-AC_SUBST(PICFLAG) + ++# Enable --enable-host-pie ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) + + AC_ARG_ENABLE(libquadmath-support, + [AS_HELP_STRING([--disable-libquadmath-support], +@@ -7526,10 +7569,6 @@ AC_CACHE_CHECK([for -fno-PIE option], + [gcc_cv_c_no_fpie=yes], + [gcc_cv_c_no_fpie=no]) + CXXFLAGS="$saved_CXXFLAGS"]) +-if test "$gcc_cv_c_no_fpie" = "yes"; then +- NO_PIE_CFLAGS="-fno-PIE" +-fi +-AC_SUBST([NO_PIE_CFLAGS]) + + # Check if -no-pie works. + AC_CACHE_CHECK([for -no-pie option], +@@ -7540,10 +7579,27 @@ AC_CACHE_CHECK([for -no-pie option], + [gcc_cv_no_pie=yes], + [gcc_cv_no_pie=no]) + LDFLAGS="$saved_LDFLAGS"]) +-if test "$gcc_cv_no_pie" = "yes"; then +- NO_PIE_FLAG="-no-pie" ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++elif test x$gcc_cv_c_no_fpie = xyes; then ++ PICFLAG=-fno-PIE ++else ++ PICFLAG= fi - AC_SUBST([enable_default_pie]) - -+# Check whether --enable-pie-tools was given; this is passed automatically -+# from the top level where it has already been validated. -+AC_ARG_ENABLE(pie-tools, -+[AS_HELP_STRING([--enable-pie-tools], -+ [build Position Independent Executables for the compilers and other tools])], -+[enable_pie_tools=$enableval], -+[enable_pie_tools=no]) -+if test x$enable_pie_tools = xyes ; then -+ AC_DEFINE(ENABLE_PIE_TOOLS, 1, -+ [Define if you build Position Independent Executables for the compilers and other tools.]) +-AC_SUBST([NO_PIE_FLAG]) ++ ++if test x$enable_host_pie = xyes; then ++ LD_PICFLAG=-pie ++elif test x$gcc_cv_no_pie = xyes; then ++ LD_PICFLAG=-no-pie ++else ++ LD_PICFLAG= +fi -+AC_SUBST([enable_pie_tools]) + - # Check if -fno-PIE works. - AC_CACHE_CHECK([for -fno-PIE option], - [gcc_cv_c_no_fpie], ++AC_SUBST([PICFLAG]) ++AC_SUBST([LD_PICFLAG]) + + # Enable Intel CET on Intel CET enabled host if jit is enabled. + GCC_CET_HOST_FLAGS(CET_HOST_FLAGS) diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc -index d7e9980ff1e..ff2a1f6665f 100644 +index 1dd3c2b13bc..3d75d0099ed 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc -@@ -3653,9 +3653,8 @@ get_tls_init_fn (tree var) +@@ -3703,9 +3703,8 @@ get_tls_init_fn (tree var) if (!flag_extern_tls_init && DECL_EXTERNAL (var)) return NULL_TREE; @@ -3555,7 +3990,33 @@ index d7e9980ff1e..ff2a1f6665f 100644 return get_local_tls_init_fn (DECL_SOURCE_LOCATION (var)); tree sname = mangle_tls_init_fn (var); -@@ -4801,22 +4800,24 @@ handle_tls_init (void) +@@ -3868,6 +3867,25 @@ generate_tls_wrapper (tree fn) + expand_or_defer_fn (finish_function (/*inline_p=*/false)); + } + ++/* A dummy init function to act as a weak placeholder for a (possibly non- ++ existent) dynamic init. */ ++static void ++generate_tls_dummy_init (tree fn) ++{ ++ tree var = DECL_BEFRIENDING_CLASSES (fn); ++ tree init_fn = get_tls_init_fn (var); ++ /* If have no init fn, or it is non-weak, then we do not need to make a ++ dummy. */ ++ if (!init_fn || !lookup_attribute ("weak", DECL_ATTRIBUTES (init_fn))) ++ return; ++ start_preparsed_function (init_fn, NULL_TREE, SF_DEFAULT | SF_PRE_PARSED); ++ tree body = begin_function_body (); ++ declare_weak (init_fn); ++ finish_return_stmt (NULL_TREE); ++ finish_function_body (body); ++ expand_or_defer_fn (finish_function (/*inline_p=*/false)); ++} ++ + /* Start a global constructor or destructor function. */ + + static tree +@@ -4657,22 +4675,24 @@ handle_tls_init (void) finish_expr_stmt (cp_build_modify_expr (loc, guard, NOP_EXPR, boolean_true_node, tf_warning_or_error)); @@ -3564,13 +4025,13 @@ index d7e9980ff1e..ff2a1f6665f 100644 { tree var = TREE_VALUE (vars); tree init = TREE_PURPOSE (vars); - one_static_initialization_or_destruction (var, init, true); + one_static_initialization_or_destruction (/*initp=*/true, var, init); - /* Output init aliases even with -fno-extern-tls-init. */ - if (TARGET_SUPPORTS_ALIASES && TREE_PUBLIC (var)) + /* Output inits even with -fno-extern-tls-init. -+ We save the list here and output either an alias or a stub function -+ below. */ ++ We save the list here and output either an alias or a stub function ++ below. */ + if (TREE_PUBLIC (var)) { - tree single_init_fn = get_tls_init_fn (var); @@ -3587,7 +4048,7 @@ index d7e9980ff1e..ff2a1f6665f 100644 } } -@@ -4824,6 +4825,30 @@ handle_tls_init (void) +@@ -4680,6 +4700,30 @@ handle_tls_init (void) finish_if_stmt (if_stmt); finish_function_body (body); expand_or_defer_fn (finish_function (/*inline_p=*/false)); @@ -3618,23 +4079,22 @@ index d7e9980ff1e..ff2a1f6665f 100644 } /* We're at the end of compilation, so generate any mangling aliases that -diff --git a/gcc/cp/g++spec.cc b/gcc/cp/g++spec.cc -index 8174d652776..2e1e06e6ac9 100644 ---- a/gcc/cp/g++spec.cc -+++ b/gcc/cp/g++spec.cc -@@ -222,7 +222,12 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, - - case OPT_static_libstdc__: - library = library >= 0 ? 2 : library; -+#ifdef HAVE_LD_STATIC_DYNAMIC -+ /* Remove -static-libstdc++ from the command only if target supports -+ LD_STATIC_DYNAMIC. When not supported, it is left in so that a -+ back-end target can use outfile substitution. */ - args[i] |= SKIPOPT; -+#endif - break; +@@ -5098,7 +5142,14 @@ c_parse_final_cleanups (void) + } + + if (!DECL_INITIAL (decl) && decl_tls_wrapper_p (decl)) +- generate_tls_wrapper (decl); ++ { ++ generate_tls_wrapper (decl); ++ /* The wrapper might have a weak reference to an init, we provide ++ a dummy function to satisfy that here. The linker/dynamic ++ loader will override this with the actual init, if one is ++ required. */ ++ generate_tls_dummy_init (decl); ++ } - case OPT_stdlib_: + if (!DECL_SAVED_TREE (decl)) + continue; diff --git a/gcc/cumulative-args.h b/gcc/cumulative-args.h new file mode 100644 index 00000000000..b60928e37f9 @@ -3661,32 +4121,72 @@ index 00000000000..b60928e37f9 +#endif /* !CHECKING_P */ + +#endif /* GCC_CUMULATIVE_ARGS_H */ +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index 1679fb81097..4fbf2096416 100644 +--- a/gcc/d/Make-lang.in ++++ b/gcc/d/Make-lang.in +@@ -64,7 +64,7 @@ ALL_DFLAGS = $(DFLAGS-$@) $(GDCFLAGS) -fversion=IN_GCC $(CHECKING_DFLAGS) \ + $(PICFLAG) $(ALIASING_FLAGS) $(NOEXCEPTION_DFLAGS) $(COVERAGE_FLAGS) \ + $(WARN_DFLAGS) + +-DCOMPILE.base = $(GDC) $(NO_PIE_CFLAGS) -c $(ALL_DFLAGS) -o $@ ++DCOMPILE.base = $(GDC) -c $(ALL_DFLAGS) -o $@ + DCOMPILE = $(DCOMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(*F).TPo + DPOSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po + DLINKER = $(GDC) $(NO_PIE_FLAG) -lstdc++ +diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi +index b30d3691fe6..93d5236f7b3 100644 +--- a/gcc/doc/install.texi ++++ b/gcc/doc/install.texi +@@ -1075,14 +1075,26 @@ code. + + @item --enable-host-shared + Specify that the @emph{host} code should be built into position-independent +-machine code (with -fPIC), allowing it to be used within shared libraries, +-but yielding a slightly slower compiler. ++machine code (with @option{-fPIC}), allowing it to be used within shared ++libraries, but yielding a slightly slower compiler. + + This option is required when building the libgccjit.so library. + + Contrast with @option{--enable-shared}, which affects @emph{target} + libraries. + ++@item --enable-host-pie ++Specify that the @emph{host} executables should be built into ++position-independent executables (with @option{-fPIE} and @option{-pie}), ++yielding a slightly slower compiler (but faster than ++@option{--enable-host-shared}). Position-independent executables are loaded ++at random addresses each time they are executed, therefore provide additional ++protection against Return Oriented Programming (ROP) attacks. ++ ++@option{--enable-host-pie}) may be used with @option{--enable-host-shared}), ++in which case @option{-fPIC} is used when compiling, and @option{-pie} when ++linking. ++ + @item @anchor{with-gnu-as}--with-gnu-as + Specify that the compiler should assume that the + assembler it finds is the GNU assembler. However, this does not modify diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index ff6c338bedb..55c8ba8969f 100644 +index de40f62e219..f735557aed0 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -670,6 +670,7 @@ Objective-C and Objective-C++ Dialects}. - @gccoptlist{-fcall-saved-@var{reg} -fcall-used-@var{reg} @gol - -ffixed-@var{reg} -fexceptions @gol - -fnon-call-exceptions -fdelete-dead-exceptions -funwind-tables @gol -+-foff-stack-trampolines @gol - -fasynchronous-unwind-tables @gol - -fno-gnu-unique @gol - -finhibit-size-directive -fcommon -fno-ident @gol -@@ -680,6 +681,7 @@ Objective-C and Objective-C++ Dialects}. - -fverbose-asm -fpack-struct[=@var{n}] @gol - -fleading-underscore -ftls-model=@var{model} @gol - -fstack-reuse=@var{reuse_level} @gol -+-fstack-use-cumulative-args @gol - -ftrampolines -ftrapv -fwrapv @gol - -fvisibility=@r{[}default@r{|}internal@r{|}hidden@r{|}protected@r{]} @gol +@@ -707,7 +707,8 @@ Objective-C and Objective-C++ Dialects}. + -fverbose-asm -fpack-struct[=@var{n}] + -fleading-underscore -ftls-model=@var{model} + -fstack-reuse=@var{reuse_level} +--ftrampolines -ftrapv -fwrapv ++-fstack-use-cumulative-args ++-ftrampolines -foff-stack-trampolines -ftrapv -fwrapv + -fvisibility=@r{[}default@r{|}internal@r{|}hidden@r{|}protected@r{]} -fstrict-volatile-bitfields -fsync-libcalls} -@@ -17071,6 +17073,17 @@ the behavior of older compilers in which temporaries' stack space is + +@@ -18160,6 +18161,17 @@ the behavior of older compilers in which temporaries' stack space is not reused, the aggressive stack reuse can lead to runtime errors. This option is used to control the temporary stack reuse optimization. -+@item -fstack-use-cumulative-args +@opindex fstack_use_cumulative_args ++@item -fstack-use-cumulative-args +This option instructs the compiler to use the +@code{cumulative_args_t}-based stack layout target hooks, +@code{TARGET_FUNCTION_ARG_BOUNDARY_CA} and @@ -3696,15 +4196,15 @@ index ff6c338bedb..55c8ba8969f 100644 +AArch64 Darwin) require using the more advanced @code{_CA}-based +hooks: For these targets this option should be enabled by default. + - @item -ftrapv @opindex ftrapv + @item -ftrapv This option generates traps for signed overflow on addition, subtraction, -@@ -17129,6 +17142,19 @@ instructions. It does not allow exceptions to be thrown from +@@ -18218,6 +18230,19 @@ instructions. It does not allow exceptions to be thrown from arbitrary signal handlers such as @code{SIGALRM}. This enables @option{-fexceptions}. -+@item -foff-stack-trampolines +@opindex foff-stack-trampolines ++@item -foff-stack-trampolines +Certain platforms (such as the Apple M1) do not permit an executable +stack. Generate calls to @code{__builtin_nested_func_ptr_created} and +@code{__builtin_nested_func_ptr_deleted} in order to allocate and @@ -3716,14 +4216,14 @@ index ff6c338bedb..55c8ba8969f 100644 +instantiate nested functions, and then @code{longjmp} back to a state +prior to having allocated those nested functions. + - @item -fdelete-dead-exceptions @opindex fdelete-dead-exceptions + @item -fdelete-dead-exceptions Consider that instructions that may throw exceptions but don't otherwise diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi -index c5006afc00d..366360612e3 100644 +index a660e33739b..4479f8cbf0e 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi -@@ -4322,6 +4322,16 @@ with the specified mode and type. The default hook returns +@@ -4354,6 +4354,16 @@ with the specified mode and type. The default hook returns @code{PARM_BOUNDARY} for all arguments. @end deftypefn @@ -3740,7 +4240,7 @@ index c5006afc00d..366360612e3 100644 @deftypefn {Target Hook} {unsigned int} TARGET_FUNCTION_ARG_ROUND_BOUNDARY (machine_mode @var{mode}, const_tree @var{type}) Normally, the size of an argument is rounded up to @code{PARM_BOUNDARY}, which is the default value for this hook. You can define this hook to -@@ -4329,6 +4339,16 @@ return a different value if an argument size must be rounded to a larger +@@ -4361,6 +4371,16 @@ return a different value if an argument size must be rounded to a larger value. @end deftypefn @@ -3758,10 +4258,10 @@ index c5006afc00d..366360612e3 100644 A C expression that is nonzero if @var{regno} is the number of a hard register in which function arguments are sometimes passed. This does diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in -index f869ddd5e5b..2c9f0f0bf14 100644 +index f7ab5d48a63..cf6259c6cf6 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in -@@ -3330,8 +3330,12 @@ required. +@@ -3341,8 +3341,12 @@ required. @hook TARGET_FUNCTION_ARG_BOUNDARY @@ -3775,10 +4275,10 @@ index f869ddd5e5b..2c9f0f0bf14 100644 A C expression that is nonzero if @var{regno} is the number of a hard register in which function arguments are sometimes passed. This does diff --git a/gcc/function.cc b/gcc/function.cc -index ad0096a43ef..e5044a60741 100644 +index edf0b2ec6cf..a8d49aa7613 100644 --- a/gcc/function.cc +++ b/gcc/function.cc -@@ -2445,7 +2445,10 @@ assign_parm_find_data_types (struct assign_parm_data_all *all, tree parm, +@@ -2448,7 +2448,10 @@ assign_parm_find_data_types (struct assign_parm_data_all *all, tree parm, else if (DECL_CHAIN (parm)) data->arg.named = 1; /* Not the last non-variadic parm. */ else if (targetm.calls.strict_argument_naming (all->args_so_far)) @@ -3790,7 +4290,7 @@ index ad0096a43ef..e5044a60741 100644 else data->arg.named = 0; /* Treat as variadic. */ -@@ -2502,6 +2505,7 @@ assign_parms_setup_varargs (struct assign_parm_data_all *all, +@@ -2505,6 +2508,7 @@ assign_parms_setup_varargs (struct assign_parm_data_all *all, function_arg_info last_named_arg = data->arg; last_named_arg.named = true; @@ -3798,7 +4298,7 @@ index ad0096a43ef..e5044a60741 100644 targetm.calls.setup_incoming_varargs (all->args_so_far, last_named_arg, &varargs_pretend_bytes, no_rtl); -@@ -2610,7 +2614,9 @@ assign_parm_find_entry_rtl (struct assign_parm_data_all *all, +@@ -2613,7 +2617,9 @@ assign_parm_find_entry_rtl (struct assign_parm_data_all *all, locate_and_pad_parm (data->arg.mode, data->arg.type, in_regs, all->reg_parm_stack_space, @@ -3809,7 +4309,7 @@ index ad0096a43ef..e5044a60741 100644 &all->stack_args_size, &data->locate); /* Update parm_stack_boundary if this parameter is passed in the -@@ -3924,7 +3930,8 @@ gimplify_parameters (gimple_seq *cleanup) +@@ -3944,7 +3950,8 @@ gimplify_parameters (gimple_seq *cleanup) if (data.arg.pass_by_reference) { tree type = TREE_TYPE (data.arg.type); @@ -3819,7 +4319,7 @@ index ad0096a43ef..e5044a60741 100644 if (reference_callee_copied (&all.args_so_far_v, orig_arg)) { tree local, t; -@@ -4027,6 +4034,7 @@ gimplify_parameters (gimple_seq *cleanup) +@@ -4047,6 +4054,7 @@ gimplify_parameters (gimple_seq *cleanup) void locate_and_pad_parm (machine_mode passed_mode, tree type, int in_regs, int reg_parm_stack_space, int partial, @@ -3827,7 +4327,7 @@ index ad0096a43ef..e5044a60741 100644 tree fndecl ATTRIBUTE_UNUSED, struct args_size *initial_offset_ptr, struct locate_and_pad_arg_data *locate) -@@ -4064,9 +4072,23 @@ locate_and_pad_parm (machine_mode passed_mode, tree type, int in_regs, +@@ -4084,9 +4092,23 @@ locate_and_pad_parm (machine_mode passed_mode, tree type, int in_regs, ? arg_size_in_bytes (type) : size_int (GET_MODE_SIZE (passed_mode))); where_pad = targetm.calls.function_arg_padding (passed_mode, type); @@ -3855,7 +4355,7 @@ index ad0096a43ef..e5044a60741 100644 /* Alignment can't exceed MAX_SUPPORTED_STACK_ALIGNMENT. */ diff --git a/gcc/function.h b/gcc/function.h -index 098613766be..009a9dc1c44 100644 +index d4ce8a7c6c6..09ab17e66c1 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see @@ -3866,7 +4366,7 @@ index 098613766be..009a9dc1c44 100644 /* Stack of pending (incomplete) sequences saved by `start_sequence'. Each element describes one pending sequence. -@@ -661,6 +662,7 @@ extern int aggregate_value_p (const_tree, const_tree); +@@ -665,6 +666,7 @@ extern int aggregate_value_p (const_tree, const_tree); extern bool use_register_for_decl (const_tree); extern gimple_seq gimplify_parameters (gimple_seq *); extern void locate_and_pad_parm (machine_mode, tree, int, int, int, @@ -3875,10 +4375,10 @@ index 098613766be..009a9dc1c44 100644 struct locate_and_pad_arg_data *); extern void generate_setjmp_warnings (void); diff --git a/gcc/gcc.cc b/gcc/gcc.cc -index bb07cc244e3..a16c1e4372b 100644 +index 16bb07f2cdc..d0349741d2f 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc -@@ -572,6 +572,7 @@ or with constant text in a single argument. +@@ -575,6 +575,7 @@ or with constant text in a single argument. %l process LINK_SPEC as a spec. %L process LIB_SPEC as a spec. %M Output multilib_os_dir. @@ -3886,7 +4386,7 @@ index bb07cc244e3..a16c1e4372b 100644 %G process LIBGCC_SPEC as a spec. %R Output the concatenation of target_system_root and target_sysroot_suffix. -@@ -1191,6 +1192,10 @@ proper position among the other output files. */ +@@ -1178,6 +1179,10 @@ proper position among the other output files. */ # define SYSROOT_HEADERS_SUFFIX_SPEC "" #endif @@ -3897,7 +4397,7 @@ index bb07cc244e3..a16c1e4372b 100644 static const char *asm_debug = ASM_DEBUG_SPEC; static const char *asm_debug_option = ASM_DEBUG_OPTION_SPEC; static const char *cpp_spec = CPP_SPEC; -@@ -5895,6 +5900,7 @@ struct spec_path_info { +@@ -5859,6 +5864,7 @@ struct spec_path_info { size_t append_len; bool omit_relative; bool separate_options; @@ -3905,7 +4405,7 @@ index bb07cc244e3..a16c1e4372b 100644 }; static void * -@@ -5904,6 +5910,16 @@ spec_path (char *path, void *data) +@@ -5868,6 +5874,16 @@ spec_path (char *path, void *data) size_t len = 0; char save = 0; @@ -3922,7 +4422,7 @@ index bb07cc244e3..a16c1e4372b 100644 if (info->omit_relative && !IS_ABSOLUTE_PATH (path)) return NULL; -@@ -6135,6 +6151,22 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) +@@ -6099,6 +6115,22 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) info.omit_relative = false; #endif info.separate_options = false; @@ -3945,7 +4445,7 @@ index bb07cc244e3..a16c1e4372b 100644 for_each_path (&startfile_prefixes, true, 0, spec_path, &info); } -@@ -6461,6 +6493,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) +@@ -6425,6 +6457,7 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) info.append_len = strlen (info.append); info.omit_relative = false; info.separate_options = true; @@ -3954,10 +4454,10 @@ index bb07cc244e3..a16c1e4372b 100644 for_each_path (&include_prefixes, false, info.append_len, spec_path, &info); diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h -index 79e296d4a66..a9caa0467ba 100644 +index 12ceef39180..af071079940 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h -@@ -427,9 +427,8 @@ typedef struct { +@@ -428,9 +428,8 @@ typedef struct { /* _Float128 is defined as a basic type, so max_align_t must be sufficiently aligned for it. This code must work in C++, so we use __float128 here; that is only available on some @@ -3970,18 +4470,10 @@ index 79e296d4a66..a9caa0467ba 100644 #endif } max_align_t; diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in -index 6e10abfd0ac..5a39342068d 100644 +index a65f13853ae..3fd564a5932 100644 --- a/gcc/jit/Make-lang.in +++ b/gcc/jit/Make-lang.in -@@ -43,6 +43,7 @@ - LIBGCCJIT_VERSION_NUM = 0 - LIBGCCJIT_MINOR_NUM = 0 - LIBGCCJIT_RELEASE_NUM = 1 -+COMMA := , - - ifneq (,$(findstring mingw,$(target))) - LIBGCCJIT_FILENAME = libgccjit-$(LIBGCCJIT_VERSION_NUM).dll -@@ -59,22 +60,18 @@ LIBGCCJIT_AGE = 1 +@@ -59,7 +59,7 @@ LIBGCCJIT_AGE = 1 LIBGCCJIT_BASENAME = libgccjit LIBGCCJIT_SONAME = \ @@ -3990,72 +4482,180 @@ index 6e10abfd0ac..5a39342068d 100644 LIBGCCJIT_FILENAME = $(LIBGCCJIT_BASENAME).$(LIBGCCJIT_VERSION_NUM).dylib LIBGCCJIT_LINKER_NAME = $(LIBGCCJIT_BASENAME).dylib --# Conditionalize the use of the LD_VERSION_SCRIPT_OPTION and --# LD_SONAME_OPTION depending if configure found them, using $(if) --# We have to define a COMMA here, otherwise the commas in the "true" --# result are treated as separators by the $(if). --COMMA := , --LIBGCCJIT_VERSION_SCRIPT_OPTION = \ -- $(if $(LD_VERSION_SCRIPT_OPTION),\ -- -Wl$(COMMA)$(LD_VERSION_SCRIPT_OPTION)$(COMMA)$(srcdir)/jit/libgccjit.map) -+# TODO: translate the libgccjit.map into a form usable by Darwin's linker and -+# then check for linker support for -exported_symbols_list=. Omitting this -+# means that all symbols in the libgccjit library will be visible. -+LIBGCCJIT_VERSION_SCRIPT_OPTION = - --LIBGCCJIT_SONAME_OPTION = \ -- $(if $(LD_SONAME_OPTION), \ -- -Wl$(COMMA)$(LD_SONAME_OPTION)$(COMMA)$(LIBGCCJIT_SONAME)) -+# This is a work-around fix for cross-compilation where the target linker -+# is ld and the host is ld64. -+LIBGCCJIT_SONAME_OPTION = -Wl,-install_name,$(LIBGCCJIT_SONAME) - - LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_FILENAME) - LIBGCCJIT_LINKER_NAME_SYMLINK = $(LIBGCCJIT_LINKER_NAME) -@@ -98,7 +95,6 @@ LIBGCCJIT_SONAME_SYMLINK = $(LIBGCCJIT_SONAME) - # LD_SONAME_OPTION depending if configure found them, using $(if) - # We have to define a COMMA here, otherwise the commas in the "true" - # result are treated as separators by the $(if). --COMMA := , - LIBGCCJIT_VERSION_SCRIPT_OPTION = \ - $(if $(LD_VERSION_SCRIPT_OPTION),\ - -Wl$(COMMA)$(LD_VERSION_SCRIPT_OPTION)$(COMMA)$(srcdir)/jit/libgccjit.map) -diff --git a/gcc/objc/objc-next-runtime-abi-02.cc b/gcc/objc/objc-next-runtime-abi-02.cc -index e50ca6e89f5..9ea63b189c7 100644 ---- a/gcc/objc/objc-next-runtime-abi-02.cc -+++ b/gcc/objc/objc-next-runtime-abi-02.cc -@@ -1033,6 +1033,7 @@ next_runtime_abi_02_protocol_decl (tree p) - else - decl = start_var_decl (objc_v2_protocol_template, buf); - OBJCMETA (decl, objc_meta, meta_protocol); -+ DECL_PRESERVE_P (decl) = 1; - return decl; - } - -@@ -2115,8 +2116,8 @@ build_v2_classrefs_table (void) - expr = convert (objc_class_type, build_fold_addr_expr (expr)); - } - /* The runtime wants this, even if it appears unused, so we must force the -- output. -- DECL_PRESERVE_P (decl) = 1; */ -+ output. */ -+ DECL_PRESERVE_P (decl) = 1; - finish_var_decl (decl, expr); - } - } -@@ -2318,6 +2319,7 @@ build_v2_protocol_list_address_table (void) - expr = convert (objc_protocol_type, build_fold_addr_expr (ref->refdecl)); - OBJCMETA (decl, objc_meta, meta_label_protocollist); - finish_var_decl (decl, expr); -+ DECL_PRESERVE_P (decl) = 1; - } - - /* TODO: delete the vec. */ +diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in +index b34db0d9156..e6ad91ee168 100644 +--- a/gcc/m2/Make-lang.in ++++ b/gcc/m2/Make-lang.in +@@ -478,6 +478,11 @@ GM2_MIN_FLAGS=$(GM2_G) $(GM2_OS) \ + -Wpedantic-cast -Wpedantic-param-names -fno-exceptions \ + -ffunction-sections -fdata-sections $(GM2_CPP) + ++# ALL_LINKERFLAGS may include -pie (when GCC is configured with ++# --enable-host-pie), so use -fPIE if needed. (It would not be ++# a good idea to override CFLAGS.) ++GM2_PICFLAGS = $(PICFLAG) ++ + O2=-O2 -g + SO_O2=-O2 -g -fPIC + SO=-O0 -g -fPIC +@@ -1354,23 +1359,23 @@ m2/boot-bin/mc$(exeext): $(BUILD-MC-BOOT-O) $(BUILD-MC-INTERFACE-O) \ + + m2/mc-boot/$(SRC_PREFIX)%.o: m2/mc-boot/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) $(CXXFLAGS) -g -c -I. -I$(srcdir)/m2/mc-boot-ch -I$(srcdir)/m2/mc-boot -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) $< -o $@ ++ $(CXX) $(CXXFLAGS) $(GM2_PICFLAGS) -g -c -I. -I$(srcdir)/m2/mc-boot-ch -I$(srcdir)/m2/mc-boot -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) $< -o $@ + + m2/mc-boot-ch/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.c m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -g -c -I. -Im2/gm2-libs -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) -Im2/gm2-libs $< -o $@ ++ $(CXX) $(CXXFLAGS) $(GM2_PICFLAGS) -DHAVE_CONFIG_H -g -c -I. -Im2/gm2-libs -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) -Im2/gm2-libs $< -o $@ + + m2/mc-boot-ch/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -g -c -I. -Im2/gm2-libs -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) -Im2/gm2-libs $< -o $@ ++ $(CXX) $(CXXFLAGS) $(GM2_PICFLAGS) -DHAVE_CONFIG_H -g -c -I. -Im2/gm2-libs -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) -Im2/gm2-libs $< -o $@ + + m2/mc-boot/main.o: $(M2LINK) $(srcdir)/m2/init/mcinit + -test -d $(@D) || $(mkinstalldirs) $(@D) + unset CC ; $(M2LINK) -s --langc++ --exit --name m2/mc-boot/main.cc $(srcdir)/m2/init/mcinit +- $(CXX) $(CXXFLAGS) -g -c -I. -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) m2/mc-boot/main.cc -o $@ ++ $(CXX) $(CXXFLAGS) $(GM2_PICFLAGS) -g -c -I. -I$(srcdir)/../include -I$(srcdir) $(INCLUDES) m2/mc-boot/main.cc -o $@ + + mcflex.o: mcflex.c m2/gm2-libs/gm2-libs-host.h +- $(CC) $(CFLAGS) -I$(srcdir)/m2/mc -g -c $< -o $@ # remember that mcReserved.h is copied into m2/mc ++ $(CC) $(CFLAGS) $(GM2_PICFLAGS) -I$(srcdir)/m2/mc -g -c $< -o $@ # remember that mcReserved.h is copied into m2/mc + + mcflex.c: $(srcdir)/m2/mc/mc.flex + flex -t $< > $@ +@@ -1378,17 +1383,17 @@ mcflex.c: $(srcdir)/m2/mc/mc.flex + m2/gm2-libs-boot/M2RTS.o: $(srcdir)/m2/gm2-libs/M2RTS.mod $(MCDEPS) $(BUILD-BOOT-H) + -test -d $(@D) || $(mkinstalldirs) $(@D) + $(MC) --suppress-noreturn -o=m2/gm2-libs-boot/M2RTS.c $(srcdir)/m2/gm2-libs/M2RTS.mod +- $(COMPILER) -c -DIN_GCC $(CFLAGS) -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(MCINCLUDES) $(INCLUDES) m2/gm2-libs-boot/M2RTS.c -o $@ ++ $(COMPILER) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(MCINCLUDES) $(INCLUDES) m2/gm2-libs-boot/M2RTS.c -o $@ + + m2/gm2-libs-boot/%.o: $(srcdir)/m2/gm2-libs-boot/%.mod $(MCDEPS) $(BUILD-BOOT-H) + -test -d $(@D) || $(mkinstalldirs) $(@D) + $(MC) -o=m2/gm2-libs-boot/$*.c $(srcdir)/m2/gm2-libs-boot/$*.mod +- $(COMPILER) -c -DIN_GCC $(CFLAGS) $(MCINCLUDES) m2/gm2-libs-boot/$*.c -o $@ ++ $(COMPILER) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) $(MCINCLUDES) m2/gm2-libs-boot/$*.c -o $@ + + m2/gm2-libs-boot/%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-H) + -test -d $(@D) || $(mkinstalldirs) $(@D) + $(MC) -o=m2/gm2-libs-boot/$*.c $(srcdir)/m2/gm2-libs/$*.mod +- $(COMPILER) -c -DIN_GCC $(CFLAGS) -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(MCINCLUDES) $(INCLUDES) m2/gm2-libs-boot/$*.c -o $@ ++ $(COMPILER) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(MCINCLUDES) $(INCLUDES) m2/gm2-libs-boot/$*.c -o $@ + + m2/gm2-libs-boot/$(SRC_PREFIX)%.h: $(srcdir)/m2/gm2-libs/%.def $(MCDEPS) + -test -d $(@D) || $(mkinstalldirs) $(@D) +@@ -1396,49 +1401,49 @@ m2/gm2-libs-boot/$(SRC_PREFIX)%.h: $(srcdir)/m2/gm2-libs/%.def $(MCDEPS) + + m2/gm2-libs-boot/RTcodummy.o: $(srcdir)/m2/gm2-libs-ch/RTcodummy.c m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c -DIN_GCC $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/RTintdummy.o: $(srcdir)/m2/gm2-libs-ch/RTintdummy.c m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c -DIN_GCC $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/wrapc.o: $(srcdir)/m2/gm2-libs-ch/wrapc.c m2/gm2-libs-boot/$(SRC_PREFIX)wrapc.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c -DHAVE_CONFIG_H $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libs $(INCLUDES) $< -o $@ ++ $(CXX) -c -DHAVE_CONFIG_H $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libs $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/UnixArgs.o: $(srcdir)/m2/gm2-libs-ch/UnixArgs.cc m2/gm2-libs-boot/$(SRC_PREFIX)UnixArgs.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c -DIN_GCC $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c -DIN_GCC $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/choosetemp.o: m2/gm2-libs-ch/choosetemp.c m2/gm2-libiberty/Gchoosetemp.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libiberty -I$(srcdir)/m2/gm2-libiberty/ $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libiberty -I$(srcdir)/m2/gm2-libiberty/ $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/errno.o: $(srcdir)/m2/gm2-libs-ch/errno.c m2/gm2-libs-boot/$(SRC_PREFIX)errno.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/dtoa.o: $(srcdir)/m2/gm2-libs-ch/dtoa.cc m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/ldtoa.o: $(srcdir)/m2/gm2-libs-ch/ldtoa.cc m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/termios.o: $(srcdir)/m2/gm2-libs-ch/termios.c $(BUILD-LIBS-BOOT-H) m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/SysExceptions.o: $(srcdir)/m2/gm2-libs-ch/SysExceptions.c \ + m2/gm2-libs-boot/$(SRC_PREFIX)SysExceptions.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/SysStorage.o: $(srcdir)/m2/gm2-libs/SysStorage.mod $(MCDEPS) $(BUILD-BOOT-H) + -test -d $(@D) || $(mkinstalldirs) $(@D) + $(MC) -o=m2/gm2-libs-boot/SysStorage.c $(srcdir)/m2/gm2-libs/SysStorage.mod +- $(COMPILER) -DIN_GCC -c $(CFLAGS) \ ++ $(COMPILER) -DIN_GCC -c $(CFLAGS) $(GM2_PICFLAGS) \ + -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(MCINCLUDES) $(INCLUDES) \ + m2/gm2-libs-boot/SysStorage.c -o m2/gm2-libs-boot/SysStorage.o + +@@ -1511,7 +1516,7 @@ m2/gm2-compiler/%.o: m2/gm2-compiler/%.mod + + m2/gm2-libs-iso/%.o: $(srcdir)/m2/gm2-libs-iso/%.c m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -DBUILD_GM2_LIBS_TARGET -DBUILD_GM2_LIBS -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -DBUILD_GM2_LIBS_TARGET -DBUILD_GM2_LIBS -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs-iso/%.o: $(srcdir)/m2/gm2-libs-iso/%.mod + -test -d $(@D) || $(mkinstalldirs) $(@D) +@@ -1613,15 +1618,15 @@ m2/gm2-libs/%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-H) + + m2/gm2-libs/%.o: $(srcdir)/m2/gm2-libs-ch/%.c m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -DBUILD_GM2_LIBS -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -DBUILD_GM2_LIBS -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs/%.o: $(srcdir)/m2/gm2-libs-ch/%.cc m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot $(INCLUDES) $< -o $@ + + m2/gm2-libs/choosetemp.o: m2/gm2-libs-ch/choosetemp.c m2/gm2-libiberty/Gchoosetemp.h m2/gm2-libs/gm2-libs-host.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) -c $(CFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libiberty -I$(srcdir)/m2/gm2-libiberty/ $(INCLUDES) $< -o $@ ++ $(CXX) -c $(CFLAGS) $(GM2_PICFLAGS) -Im2/gm2-libs -I$(srcdir)/m2 -Im2 -I. -Im2/gm2-libs-boot -Im2/gm2-libiberty -I$(srcdir)/m2/gm2-libiberty/ $(INCLUDES) $< -o $@ + + m2/gm2-libs-boot/libgm2.a: m2/boot-bin/mc$(exeext) $(BUILD-LIBS-BOOT) + -test -d $(@D) || $(mkinstalldirs) $(@D) +@@ -1722,11 +1727,11 @@ include m2/Make-maintainer + else + m2/pge-boot/%.o: m2/pge-boot/%.c m2/gm2-libs/gm2-libs-host.h m2/gm2config.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) $(CFLAGS) $(INCLUDES) -I$(srcdir)/m2/pge-boot -Im2/gm2-libs -g -c $< -o $@ ++ $(CXX) $(CFLAGS) $(GM2_PICFLAGS) $(INCLUDES) -I$(srcdir)/m2/pge-boot -Im2/gm2-libs -g -c $< -o $@ + + m2/pge-boot/%.o: m2/pge-boot/%.cc m2/gm2-libs/gm2-libs-host.h m2/gm2config.h + -test -d $(@D) || $(mkinstalldirs) $(@D) +- $(CXX) $(CXXFLAGS) $(INCLUDES) -I$(srcdir)/m2/pge-boot -Im2/gm2-libs -g -c $< -o $@ ++ $(CXX) $(CXXFLAGS) $(GM2_PICFLAGS) $(INCLUDES) -I$(srcdir)/m2/pge-boot -Im2/gm2-libs -g -c $< -o $@ + + $(PGE): $(BUILD-PGE-O) + +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(BUILD-PGE-O) -lm diff --git a/gcc/target.def b/gcc/target.def -index d85adf36a39..5eb1fdce24e 100644 +index 171bbd1caf1..ba2c342d40f 100644 --- a/gcc/target.def +++ b/gcc/target.def -@@ -4967,6 +4967,18 @@ with the specified mode and type. The default hook returns\n\ +@@ -4992,6 +4992,18 @@ with the specified mode and type. The default hook returns\n\ unsigned int, (machine_mode mode, const_tree type), default_function_arg_boundary) @@ -4074,7 +4674,7 @@ index d85adf36a39..5eb1fdce24e 100644 DEFHOOK (function_arg_round_boundary, "Normally, the size of an argument is rounded up to @code{PARM_BOUNDARY},\n\ -@@ -4976,6 +4988,18 @@ value.", +@@ -5001,6 +5013,18 @@ value.", unsigned int, (machine_mode mode, const_tree type), default_function_arg_round_boundary) @@ -4094,10 +4694,10 @@ index d85adf36a39..5eb1fdce24e 100644 is not allowed for this 'val' argument; NULL otherwise. */ DEFHOOK diff --git a/gcc/target.h b/gcc/target.h -index d6fa6931499..40c3da87656 100644 +index cd448e4b7ab..064523f2a2e 100644 --- a/gcc/target.h +++ b/gcc/target.h -@@ -51,22 +51,7 @@ +@@ -51,22 +51,8 @@ #include "insn-codes.h" #include "tm.h" #include "hard-reg-set.h" @@ -4117,15 +4717,16 @@ index d6fa6931499..40c3da87656 100644 -union cumulative_args_t { void *p; }; - -#endif /* !CHECKING_P */ ++#include "tree-core.h" +#include "cumulative-args.h" /* Types of memory operation understood by the "by_pieces" infrastructure. Used by the TARGET_USE_BY_PIECES_INFRASTRUCTURE_P target hook and diff --git a/gcc/targhooks.cc b/gcc/targhooks.cc -index 399d6f874dc..9d554adcb45 100644 +index 51bf3fb7a82..421aacd829d 100644 --- a/gcc/targhooks.cc +++ b/gcc/targhooks.cc -@@ -850,6 +850,14 @@ default_function_arg_boundary (machine_mode mode ATTRIBUTE_UNUSED, +@@ -856,6 +856,14 @@ default_function_arg_boundary (machine_mode mode ATTRIBUTE_UNUSED, return PARM_BOUNDARY; } @@ -4140,7 +4741,7 @@ index 399d6f874dc..9d554adcb45 100644 unsigned int default_function_arg_round_boundary (machine_mode mode ATTRIBUTE_UNUSED, const_tree type ATTRIBUTE_UNUSED) -@@ -857,6 +865,14 @@ default_function_arg_round_boundary (machine_mode mode ATTRIBUTE_UNUSED, +@@ -863,6 +871,14 @@ default_function_arg_round_boundary (machine_mode mode ATTRIBUTE_UNUSED, return PARM_BOUNDARY; } @@ -4156,10 +4757,10 @@ index 399d6f874dc..9d554adcb45 100644 hook_void_bitmap (bitmap regs ATTRIBUTE_UNUSED) { diff --git a/gcc/targhooks.h b/gcc/targhooks.h -index ecce55ebe79..ba110ade58b 100644 +index cf3d3107a0d..cd3c6a8d18a 100644 --- a/gcc/targhooks.h +++ b/gcc/targhooks.h -@@ -154,6 +154,12 @@ extern unsigned int default_function_arg_boundary (machine_mode, +@@ -158,6 +158,12 @@ extern unsigned int default_function_arg_boundary (machine_mode, const_tree); extern unsigned int default_function_arg_round_boundary (machine_mode, const_tree); @@ -4172,3542 +4773,1425 @@ index ecce55ebe79..ba110ade58b 100644 extern bool hook_bool_const_rtx_commutative_p (const_rtx, int); extern rtx default_function_value (const_tree, const_tree, bool); extern HARD_REG_SET default_zero_call_used_regs (HARD_REG_SET); -diff --git a/gcc/testsuite/g++.dg/abi/aarch64_guard1.C b/gcc/testsuite/g++.dg/abi/aarch64_guard1.C -index e2669a89fbf..52be32decc6 100644 ---- a/gcc/testsuite/g++.dg/abi/aarch64_guard1.C -+++ b/gcc/testsuite/g++.dg/abi/aarch64_guard1.C -@@ -12,5 +12,6 @@ int *foo () - return &x; - } +diff --git a/gcc/testsuite/gfortran.dg/coarray/caf.exp b/gcc/testsuite/gfortran.dg/coarray/caf.exp +index d232be2fa90..fb233e3d082 100644 +--- a/gcc/testsuite/gfortran.dg/coarray/caf.exp ++++ b/gcc/testsuite/gfortran.dg/coarray/caf.exp +@@ -28,6 +28,7 @@ --// { dg-final { scan-assembler _ZGVZ3foovE1x,8,8 } } -+// { dg-final { scan-assembler _ZGVZ3foovE1x,8,8 { target { ! *-*-darwin* } } } } -+// { dg-final { scan-assembler __DATA,__bss,__ZGVZ3foovE1x,8,3 { target *-*-darwin* } } } - // { dg-final { scan-tree-dump "& 1" "original" } } -diff --git a/gcc/testsuite/g++.dg/abi/arm_va_list.C b/gcc/testsuite/g++.dg/abi/arm_va_list.C -index 4f6f3a46da4..ff9fd8bcf0d 100644 ---- a/gcc/testsuite/g++.dg/abi/arm_va_list.C -+++ b/gcc/testsuite/g++.dg/abi/arm_va_list.C -@@ -8,8 +8,10 @@ - // #include - typedef __builtin_va_list va_list; - --// { dg-final { scan-assembler "\n_Z1fPSt9__va_list:" } } -+// { dg-final { scan-assembler "\n_Z1fPSt9__va_list:" { target { ! *-*-darwin* } } } } -+// { dg-final { scan-assembler "\n__Z1fPPc:" { target *-*-darwin* } } } - void f(va_list*) {} - --// { dg-final { scan-assembler "\n_Z1gSt9__va_listS_:" } } -+// { dg-final { scan-assembler "\n_Z1gSt9__va_listS_:" { target { ! *-*-darwin* } } } } -+// { dg-final { scan-assembler "\n__Z1gPcS_:" { target *-*-darwin* } } } - void g(va_list, va_list) {} -diff --git a/gcc/testsuite/g++.dg/cpp0x/pr106435-b.cc b/gcc/testsuite/g++.dg/cpp0x/pr106435-b.cc -new file mode 100644 -index 00000000000..4f581694177 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/pr106435-b.cc -@@ -0,0 +1,17 @@ -+// PR c++/106435 -+#include "pr106435.h" -+ -+//#include -+ -+Foo::Foo() { -+ ++num_calls; -+// std::cout << "Foo::Foo(this=" << this << ")\n"; -+} -+ -+int Foo::func() { -+// std::cout << "Foo::func(this=" << this << ")\n"; -+ return num_calls; -+} -+ -+thread_local Foo Bar::foo; -+thread_local Foo Bar::baz; -diff --git a/gcc/testsuite/g++.dg/cpp0x/pr106435.C b/gcc/testsuite/g++.dg/cpp0x/pr106435.C -new file mode 100644 -index 00000000000..d600976f9f9 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/pr106435.C -@@ -0,0 +1,20 @@ -+// PR c++/106435 -+// { dg-do run { target c++11 } } -+// { dg-additional-sources "pr106435-b.cc" } -+ -+#include "pr106435.h" -+ -+int num_calls = 0; -+ -+extern "C" __attribute__((__noreturn__)) void abort(); -+ -+thread_local Foo Bar::bat; -+ -+int main() { -+ int v = Bar::foo.func(); -+ if (v != 2) -+ abort(); -+ v = Bar::bat.func(); -+ if (v != 3) -+ abort(); -+} -diff --git a/gcc/testsuite/g++.dg/cpp0x/pr106435.h b/gcc/testsuite/g++.dg/cpp0x/pr106435.h -new file mode 100644 -index 00000000000..240de1ee9a9 ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp0x/pr106435.h -@@ -0,0 +1,14 @@ -+// PR c++/106435 -+#pragma once -+ -+extern int num_calls; -+struct Foo { -+ Foo(); -+ int func(); -+}; + # Load procedures from common libraries. + load_lib gfortran-dg.exp ++load_lib atomic-dg.exp + + # If a testcase doesn't have special options, use these. + global DEFAULT_FFLAGS +@@ -47,6 +48,7 @@ global gfortran_test_path + global gfortran_aux_module_flags + set gfortran_test_path $srcdir/$subdir + set gfortran_aux_module_flags $DEFAULT_FFLAGS + -+struct Bar { -+ thread_local static Foo foo; -+ thread_local static Foo baz; -+ thread_local static Foo bat; -+}; -diff --git a/gcc/testsuite/g++.dg/ext/arm-bf16/bf16-mangle-aarch64-1.C b/gcc/testsuite/g++.dg/ext/arm-bf16/bf16-mangle-aarch64-1.C -index 5426a1814b8..a017ce8ce5f 100644 ---- a/gcc/testsuite/g++.dg/ext/arm-bf16/bf16-mangle-aarch64-1.C -+++ b/gcc/testsuite/g++.dg/ext/arm-bf16/bf16-mangle-aarch64-1.C -@@ -2,12 +2,12 @@ - - /* Test mangling */ - --/* { dg-final { scan-assembler "\t.global\t_Z1fPu6__bf16" } } */ -+/* { dg-final { scan-assembler {\t.globa?l[ \t]_?_Z1fPu6__bf16} } } */ - void f (__bf16 *x) { } - --/* { dg-final { scan-assembler "\t.global\t_Z1gPu6__bf16S_" } } */ -+/* { dg-final { scan-assembler {\t.globa?l[ \t]_?_Z1gPu6__bf16S_} } } */ - void g (__bf16 *x, __bf16 *y) { } - --/* { dg-final { scan-assembler "\t.global\t_ZN1SIu6__bf16u6__bf16E1iE" } } */ -+/* { dg-final { scan-assembler {\t.globa?l[ \t]_?_ZN1SIu6__bf16u6__bf16E1iE} } } */ - template struct S { static int i; }; - template <> int S<__bf16, __bf16>::i = 3; -diff --git a/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C b/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C -index ee4b385b17f..eabb3b517a4 100644 ---- a/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C -+++ b/gcc/testsuite/g++.dg/torture/darwin-cfstring-3.C -@@ -26,5 +26,5 @@ void foo(void) { - - /* { dg-final { scan-assembler "\\.long\[ \\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ \\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler "\\.long\[ \\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ \\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t4\n" { target { *-*-darwin* && { lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t10\n" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t4\n} { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t10\n} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/g++.target/aarch64/no_unique_address_1.C b/gcc/testsuite/g++.target/aarch64/no_unique_address_1.C -index 5fc68ea5d6d..5faf915fa54 100644 ---- a/gcc/testsuite/g++.target/aarch64/no_unique_address_1.C -+++ b/gcc/testsuite/g++.target/aarch64/no_unique_address_1.C -@@ -1,5 +1,5 @@ - /* { dg-options "-std=c++11 -O -foptimize-sibling-calls -fpeephole2" } */ --/* { dg-final { check-function-bodies "**" "" "" { target lp64 } } } */ -+/* { dg-final { check-function-bodies "**" "" "" { target { lp64 && { ! aarch64*-*-darwin* } } } } } */ - - struct X { }; - struct Y { int : 0; }; -diff --git a/gcc/testsuite/g++.target/aarch64/no_unique_address_2.C b/gcc/testsuite/g++.target/aarch64/no_unique_address_2.C -index f0717133ccd..322ec127c79 100644 ---- a/gcc/testsuite/g++.target/aarch64/no_unique_address_2.C -+++ b/gcc/testsuite/g++.target/aarch64/no_unique_address_2.C -@@ -1,5 +1,5 @@ - /* { dg-options "-std=c++17 -O -foptimize-sibling-calls -fpeephole2" } */ --/* { dg-final { check-function-bodies "**" "" "" { target lp64 } } } */ -+/* { dg-final { check-function-bodies "**" "" "" { target { lp64 && { ! aarch64*-*-darwin* } } } } } */ - - struct X { }; - struct Y { int : 0; }; -diff --git a/gcc/testsuite/g++.target/aarch64/sve/aarch64-sve.exp b/gcc/testsuite/g++.target/aarch64/sve/aarch64-sve.exp -index 03a6537a53e..d4c2052dc59 100644 ---- a/gcc/testsuite/g++.target/aarch64/sve/aarch64-sve.exp -+++ b/gcc/testsuite/g++.target/aarch64/sve/aarch64-sve.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } then { - return + proc dg-compile-aux-modules { args } { + global gfortran_test_path + global gfortran_aux_module_flags +@@ -71,7 +73,16 @@ proc dg-compile-aux-modules { args } { + # Add -latomic only where supported. Assume built-in support elsewhere. + set maybe_atomic_lib "" + if [check_effective_target_libatomic_available] { +- set maybe_atomic_lib "-latomic" ++ #set maybe_atomic_lib "-latomic" ++ if ![is_remote host] { ++ if [info exists TOOL_OPTIONS] { ++ set maybe_atomic_lib "[atomic_link_flags [get_multilibs ${TOOL_OPTIONS}]]" ++ } else { ++ set maybe_atomic_lib "[atomic_link_flags [get_multilibs]]" ++ } ++ } ++ set t [get_multilibs] ++ puts "maybe al $maybe_atomic_lib ml $t" } -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} -+ - # Load support procs. - load_lib g++-dg.exp - -diff --git a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -index 38140413a97..559e1f37c68 100644 ---- a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -+++ b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -@@ -24,6 +24,11 @@ if { ![istarget aarch64*-*-*] } { - return + # Main loop. +@@ -97,14 +108,14 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ]] + foreach flags $option_list { + verbose "Testing $nshort (single), $flags" 1 + set gfortran_aux_module_flags "-fcoarray=single $flags" +- dg-test $test "-fcoarray=single $flags $maybe_atomic_lib" "" ++ dg-test $test "-fcoarray=single $flags" $maybe_atomic_lib + cleanup-modules "" + } + + foreach flags $option_list { + verbose "Testing $nshort (libcaf_single), $flags" 1 + set gfortran_aux_module_flags "-fcoarray=lib $flags -lcaf_single" +- dg-test $test "-fcoarray=lib $flags -lcaf_single $maybe_atomic_lib" "" ++ dg-test $test "-fcoarray=lib $flags -lcaf_single" $maybe_atomic_lib + cleanup-modules "" + } } +diff --git a/gcc/testsuite/gfortran.dg/dg.exp b/gcc/testsuite/gfortran.dg/dg.exp +index ee2760327dc..73541ea7301 100644 +--- a/gcc/testsuite/gfortran.dg/dg.exp ++++ b/gcc/testsuite/gfortran.dg/dg.exp +@@ -18,6 +18,7 @@ -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} -+ # Load support procs. - load_lib g++-dg.exp - -diff --git a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle.exp b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle.exp -index d1887eb8087..c9fee945c52 100644 ---- a/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle.exp -+++ b/gcc/testsuite/g++.target/aarch64/sve/acle/aarch64-sve-acle.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } { - return + load_lib gfortran-dg.exp ++load_lib atomic-dg.exp + + # If a testcase doesn't have special options, use these. + global DEFAULT_FFLAGS +@@ -53,13 +54,38 @@ proc dg-compile-aux-modules { args } { + } } -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return ++# coarray tests might need libatomic. Assume that it is either not needed or ++# provided by builtins if it's not available. ++set maybe_atomic_lib "" ++if [check_effective_target_libatomic_available] { ++ if ![is_remote host] { ++ if [info exists TOOL_OPTIONS] { ++ set maybe_atomic_lib "[atomic_link_flags [get_multilibs ${TOOL_OPTIONS}]]" ++ } else { ++ set maybe_atomic_lib "[atomic_link_flags [get_multilibs]]" ++ } ++ } else { ++ set maybe_atomic_lib "" ++ } ++ set t [get_multilibs] ++ puts "dg set al $maybe_atomic_lib ml $t" +} + - # Load support procs. - load_lib g++-dg.exp - -diff --git a/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp b/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -index 78e8ecae729..e22ef5f0876 100644 ---- a/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -+++ b/gcc/testsuite/g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -@@ -24,6 +24,11 @@ if { ![istarget aarch64*-*-*] } { - return - } - -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return ++set all_flags $DEFAULT_FFLAGS ++if { $maybe_atomic_lib != "" } { ++ foreach f $maybe_atomic_lib { ++ lappend all_flags $f ++ } +} + - # Load support procs. - load_lib g++-dg.exp - -diff --git a/gcc/testsuite/gcc.dg/builtin-apply2.c b/gcc/testsuite/gcc.dg/builtin-apply2.c -index 0f350f4ac16..d1e70b3a3e5 100644 ---- a/gcc/testsuite/gcc.dg/builtin-apply2.c -+++ b/gcc/testsuite/gcc.dg/builtin-apply2.c -@@ -1,7 +1,7 @@ - /* { dg-do run } */ - /* { dg-require-effective-target untyped_assembly } */ - /* { dg-skip-if "Variadic funcs have all args on stack. Normal funcs have args in registers." { "avr-*-* nds32*-*-* amdgcn-*-*" } } */ --/* { dg-skip-if "Variadic funcs use different argument passing from normal funcs." { "csky*-*-* riscv*-*-* or1k*-*-* msp430-*-* pru-*-* loongarch*-*-*" } } */ -+/* { dg-skip-if "Variadic funcs use different argument passing from normal funcs." { "csky*-*-* riscv*-*-* or1k*-*-* msp430-*-* pru-*-* loongarch*-*-* aarch64-apple-darwin*" } } */ - /* { dg-skip-if "Variadic funcs use Base AAPCS. Normal funcs use VFP variant." { arm*-*-* && arm_hf_eabi } } */ - - /* PR target/12503 */ -diff --git a/gcc/testsuite/gcc.dg/cwsc1.c b/gcc/testsuite/gcc.dg/cwsc1.c -index e793e26116a..7d8b472bdf6 100644 ---- a/gcc/testsuite/gcc.dg/cwsc1.c -+++ b/gcc/testsuite/gcc.dg/cwsc1.c -@@ -6,7 +6,11 @@ - #elif defined(__i386__) - # define CHAIN "%ecx" - #elif defined(__aarch64__) --# define CHAIN "x18" -+# if defined(__APPLE__) -+# define CHAIN "x16" -+# else -+# define CHAIN "x18" -+# endif - #elif defined(__alpha__) - # define CHAIN "$1" - #elif defined(__arm__) -diff --git a/gcc/testsuite/gcc.dg/darwin-segaddr.c b/gcc/testsuite/gcc.dg/darwin-segaddr.c -index 526db77bd9c..fcc324b3031 100644 ---- a/gcc/testsuite/gcc.dg/darwin-segaddr.c -+++ b/gcc/testsuite/gcc.dg/darwin-segaddr.c -@@ -1,7 +1,8 @@ - /* Check that -segaddr gets through and works. */ - /* { dg-do run { target *-*-darwin* } } */ - /* { dg-options "-O0 -segaddr __TEST 0x200000 -fno-pie" { target { *-*-darwin* && { ! lp64 } } } } */ --/* { dg-options "-O0 -segaddr __TEST 0x110000000 -fno-pie" { target { *-*-darwin* && lp64 } } } */ -+/* { dg-options "-O0 -segaddr __TEST 0x110000000 -fno-pie" { target { *-*-darwin[1456789]* && lp64 } } } */ -+/* { dg-options "-O0 -segaddr __TEST 0x110000000 " { target { *-*-darwin2* && lp64 } } } */ - - extern void abort (); - -diff --git a/gcc/testsuite/gcc.dg/pr26427.c b/gcc/testsuite/gcc.dg/pr26427.c -index add13ca209e..2c09f28195d 100644 ---- a/gcc/testsuite/gcc.dg/pr26427.c -+++ b/gcc/testsuite/gcc.dg/pr26427.c -@@ -1,4 +1,4 @@ --/* { dg-warning "this target does not support" "" {target *86*-*-darwin* } 0 } */ -+/* { dg-warning "this target does not support" "" {target *86*-*-darwin* aarch64-*-darwin* } 0 } */ - /* { dg-do run { target { *-*-darwin* } } } */ - /* { dg-options { -fsection-anchors -O } } */ - /* PR target/26427 */ -diff --git a/gcc/testsuite/gcc.dg/pubtypes-2.c b/gcc/testsuite/gcc.dg/pubtypes-2.c -index 116e3489bc0..b3d1231ad44 100644 ---- a/gcc/testsuite/gcc.dg/pubtypes-2.c -+++ b/gcc/testsuite/gcc.dg/pubtypes-2.c -@@ -2,7 +2,8 @@ - /* { dg-options "-O0 -gdwarf-2 -dA" } */ - /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } } */ - /* { dg-final { scan-assembler "__debug_pubtypes" } } */ --/* { dg-final { scan-assembler {long+[ \t]+0x14d+[ \t]+[#;]+[ \t]+Pub Info Length} } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x14d+[ \t]+[#;]+[ \t]+Pub Info Length} { target { ! aarch64-*-darwin* } } } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x163+[ \t]+[#;]+[ \t]+Pub Info Length} { target aarch64-*-darwin* } } } */ - /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - -diff --git a/gcc/testsuite/gcc.dg/pubtypes-3.c b/gcc/testsuite/gcc.dg/pubtypes-3.c -index 3fb3468fb00..950a9ba72fc 100644 ---- a/gcc/testsuite/gcc.dg/pubtypes-3.c -+++ b/gcc/testsuite/gcc.dg/pubtypes-3.c -@@ -2,7 +2,8 @@ - /* { dg-options "-O0 -gdwarf-2 -dA" } */ - /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } } */ - /* { dg-final { scan-assembler "__debug_pubtypes" } } */ --/* { dg-final { scan-assembler {long+[ \t]+0x14d+[ \t]+[#;]+[ \t]+Pub Info Length} } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x14d+[ \t]+[#;]+[ \t]+Pub Info Length} { target { ! aarch64-*-darwin* } } } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x163+[ \t]+[#;]+[ \t]+Pub Info Length} { target aarch64-*-darwin* } } } */ - /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - /* { dg-final { scan-assembler-not "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ -diff --git a/gcc/testsuite/gcc.dg/pubtypes-4.c b/gcc/testsuite/gcc.dg/pubtypes-4.c -index 83fba8dfabc..7250771587b 100644 ---- a/gcc/testsuite/gcc.dg/pubtypes-4.c -+++ b/gcc/testsuite/gcc.dg/pubtypes-4.c -@@ -2,7 +2,8 @@ - /* { dg-options "-O0 -gdwarf-2 -dA" } */ - /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } } */ - /* { dg-final { scan-assembler "__debug_pubtypes" } } */ --/* { dg-final { scan-assembler {long+[ \t]+0x184+[ \t]+[#;]+[ \t]+Pub Info Length} } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x184+[ \t]+[#;]+[ \t]+Pub Info Length} { target { ! aarch64-*-darwin* } } } } */ -+/* { dg-final { scan-assembler {long+[ \t]+0x19a+[ \t]+[#;]+[ \t]+Pub Info Length} { target aarch64-*-darwin* } } } */ - /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ - /* { dg-final { scan-assembler "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ -diff --git a/gcc/testsuite/gcc.dg/rtl/aarch64/big-endian-cse-1.c b/gcc/testsuite/gcc.dg/rtl/aarch64/big-endian-cse-1.c -index 1559a489f25..aa2da0cbca5 100644 ---- a/gcc/testsuite/gcc.dg/rtl/aarch64/big-endian-cse-1.c -+++ b/gcc/testsuite/gcc.dg/rtl/aarch64/big-endian-cse-1.c -@@ -1,4 +1,5 @@ - /* { dg-do compile { target aarch64*-*-* } } */ -+/* { dg-skip-if "Darwin platforms do not support big-endian arm64" *-*-darwin* } */ - /* { dg-require-effective-target lp64 } */ - /* { dg-options "-O3 -mbig-endian" } */ - -diff --git a/gcc/testsuite/gcc.dg/tls/pr78796.c b/gcc/testsuite/gcc.dg/tls/pr78796.c -index 038e5366e41..31e03dd419c 100644 ---- a/gcc/testsuite/gcc.dg/tls/pr78796.c -+++ b/gcc/testsuite/gcc.dg/tls/pr78796.c -@@ -1,7 +1,7 @@ - /* PR target/78796 */ - /* { dg-do run } */ - /* { dg-options "-O2" } */ --/* { dg-additional-options "-mcmodel=large" { target aarch64-*-* } } */ -+/* { dg-additional-options "-mcmodel=large" { target { { aarch64-*-* } && { ! aarch64-*-darwin* } } } } */ - /* { dg-require-effective-target tls_runtime } */ - /* { dg-add-options tls } */ - -diff --git a/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c b/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c -index ee4b385b17f..eabb3b517a4 100644 ---- a/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c -+++ b/gcc/testsuite/gcc.dg/torture/darwin-cfstring-3.c -@@ -26,5 +26,5 @@ void foo(void) { - - /* { dg-final { scan-assembler "\\.long\[ \\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ \\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+4\n" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler "\\.long\[ \\t\]+___CFConstantStringClassReference\n\[ \\t\]*\\.long\[ \\t\]+1992\n\[ \\t\]*\\.long\[ \\t\]+\[lL\]C.*\n\[ \\t\]*\\.long\[ \\t\]+10\n" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t4\n" { target { *-*-darwin* && { lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t10\n" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t4\n} { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t10\n} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c b/gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c -index 552ca1433f4..16643ceb198 100644 ---- a/gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c -+++ b/gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-2.c -@@ -9,7 +9,7 @@ - /* arm_hf_eabi: Variadic funcs use Base AAPCS. Normal funcs use VFP variant. - avr: Variadic funcs don't pass arguments in registers, while normal funcs - do. */ --/* { dg-skip-if "Variadic funcs use different argument passing from normal funcs" { arm_hf_eabi || { csky*-*-* avr-*-* riscv*-*-* or1k*-*-* msp430-*-* amdgcn-*-* pru-*-* loongarch*-*-* } } } */ -+/* { dg-skip-if "Variadic funcs use different argument passing from normal funcs" { arm_hf_eabi || { csky*-*-* avr-*-* riscv*-*-* or1k*-*-* msp430-*-* amdgcn-*-* pru-*-* loongarch*-*-* aarch64-apple-darwin* } } } */ - /* { dg-skip-if "Variadic funcs have all args on stack. Normal funcs have args in registers." { nds32*-*-* } { v850*-*-* } } */ - /* { dg-require-effective-target untyped_assembly } */ - -diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c -index 0224997f18a..3684cffdc64 100644 ---- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c -+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c -@@ -25,9 +25,9 @@ f1 (int i, ...) - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -46,9 +46,9 @@ f2 (int i, ...) - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 8 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 1 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -62,10 +62,10 @@ f3 (int i, ...) - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and 16 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and 16 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -81,9 +81,9 @@ f4 (int i, ...) - /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -100,9 +100,9 @@ f5 (int i, ...) - /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -121,9 +121,9 @@ f6 (int i, ...) - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 3 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -139,9 +139,9 @@ f7 (int i, ...) - /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - void -@@ -159,9 +159,9 @@ f8 (int i, ...) - /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ ++puts "revised FFLAGS $all_flags" ++ + # Main loop. + gfortran-dg-runtest [lsort \ +- [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" $DEFAULT_FFLAGS ++ [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" $all_flags - void -@@ -177,9 +177,9 @@ f9 (int i, ...) - /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ + gfortran-dg-runtest [lsort \ +- [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] "" $DEFAULT_FFLAGS +- ++ [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] "" $all_flags - void -@@ -197,9 +197,9 @@ f10 (int i, ...) - /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ + # All done. + dg-finish +diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp +index 35e60eaaed5..157b60908d6 100644 +--- a/gcc/testsuite/lib/asan-dg.exp ++++ b/gcc/testsuite/lib/asan-dg.exp +@@ -78,7 +78,7 @@ proc asan_link_flags_1 { paths lib } { + || [file exists "${gccpath}/libsanitizer/${lib}/.libs/lib${lib}.${shlib_ext}"] } { + append flags " -B${gccpath}/libsanitizer/ " + append flags " -B${gccpath}/libsanitizer/${lib}/ " +- append flags " -L${gccpath}/libsanitizer/${lib}/.libs " ++ append flags " -B${gccpath}/libsanitizer/${lib}/.libs " + append ld_library_path ":${gccpath}/libsanitizer/${lib}/.libs" + } + } else { +diff --git a/gcc/testsuite/lib/atomic-dg.exp b/gcc/testsuite/lib/atomic-dg.exp +index 1589acd8eaf..ce1799cef2d 100644 +--- a/gcc/testsuite/lib/atomic-dg.exp ++++ b/gcc/testsuite/lib/atomic-dg.exp +@@ -33,7 +33,7 @@ proc atomic_link_flags { paths } { + if { [file exists "${gccpath}/libatomic/.libs/libatomic.a"] + || [file exists "${gccpath}/libatomic/.libs/libatomic.${shlib_ext}"] } { + append flags " -B${gccpath}/libatomic/ " +- append flags " -L${gccpath}/libatomic/.libs" ++ append flags " -B${gccpath}/libatomic/.libs" + append ld_library_path ":${gccpath}/libatomic/.libs" + } + } else { +diff --git a/gcc/testsuite/lib/target-libpath.exp b/gcc/testsuite/lib/target-libpath.exp +index 6d530fb4af6..5de039b4fc2 100644 +--- a/gcc/testsuite/lib/target-libpath.exp ++++ b/gcc/testsuite/lib/target-libpath.exp +@@ -67,6 +67,7 @@ proc set_ld_library_path_env_vars { } { + global orig_dyld_library_path + global orig_path + global orig_gcc_exec_prefix ++ global ENABLE_DARWIN_AT_RPATH + global env - void -@@ -218,9 +218,9 @@ f11 (int i, ...) - /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 24 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 3 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ + # Save the original GCC_EXEC_PREFIX. +@@ -133,6 +134,7 @@ proc set_ld_library_path_env_vars { } { + # + # Doing this is somewhat of a hack as ld_library_path gets repeated in + # SHLIB_PATH and LD_LIBRARY_PATH when unix_load sets these variables. ++ if { ![istarget *-*-darwin*] } { + if { $orig_ld_library_path_saved } { + setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path" + } else { +@@ -166,11 +168,23 @@ proc set_ld_library_path_env_vars { } { + } else { + setenv LD_LIBRARY_PATH_64 "$ld_library_path" + } +- if { $orig_dyld_library_path_saved } { +- setenv DYLD_LIBRARY_PATH "$ld_library_path:$orig_dyld_library_path" +- } else { +- setenv DYLD_LIBRARY_PATH "$ld_library_path" + } ++ if { [istarget *-*-darwin*] } { ++ if { [info exists ENABLE_DARWIN_AT_RPATH] || [istarget *-*-darwin1\[5-9\]*] ++ || [istarget *-*-darwin20*] } { ++ # Either we are not using DYLD_LIBRARY_PATH or we're on a version of the ++ # OS for which it is not passed through system exes. ++ if [info exists env(DYLD_LIBRARY_PATH)] { ++ unsetenv DYLD_LIBRARY_PATH ++ } ++ } else { ++ if { $orig_dyld_library_path_saved } { ++ setenv DYLD_LIBRARY_PATH "$ld_library_path:$orig_dyld_library_path" ++ } else { ++ setenv DYLD_LIBRARY_PATH "$ld_library_path" ++ } ++ } ++ } + if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { + if { $orig_path_saved } { + setenv PATH "$ld_library_path:$orig_path" +@@ -179,6 +193,7 @@ proc set_ld_library_path_env_vars { } { + } + } - void -@@ -239,9 +239,9 @@ f12 (int i, ...) - /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 24 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and 48 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and 48 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ ++ verbose -log "set paths" + verbose -log "LD_LIBRARY_PATH=[getenv LD_LIBRARY_PATH]" + verbose -log "LD_RUN_PATH=[getenv LD_RUN_PATH]" + verbose -log "SHLIB_PATH=[getenv SHLIB_PATH]" +diff --git a/gcc/tree-nested.cc b/gcc/tree-nested.cc +index 1418e1f7f56..060072ba76e 100644 +--- a/gcc/tree-nested.cc ++++ b/gcc/tree-nested.cc +@@ -611,6 +611,14 @@ get_trampoline_type (struct nesting_info *info) + if (trampoline_type) + return trampoline_type; - void -@@ -260,9 +260,9 @@ f13 (int i, ...) - /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 24 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and 48 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and 48 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ ++ /* When trampolines are created off-stack then the only thing we need in the ++ local frame is a single pointer. */ ++ if (flag_off_stack_trampolines) ++ { ++ trampoline_type = build_pointer_type (void_type_node); ++ return trampoline_type; ++ } ++ + align = TRAMPOLINE_ALIGNMENT; + size = TRAMPOLINE_SIZE; - void -@@ -281,9 +281,9 @@ f14 (int i, ...) - /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 24 GPR units and 3" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 1 GPR units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 8 GPR units and 32 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 8 GPR units and 32 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - inline void __attribute__((always_inline)) -@@ -305,11 +305,11 @@ f15 (int i, ...) - /* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save 1 GPR units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - - /* We may be able to improve upon this after fixing PR66010/PR66013. */ - /* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ - - /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ -diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c -index 1a637d6efe4..77cdf384df4 100644 ---- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c -+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c -@@ -27,9 +27,9 @@ f1 (int i, ...) - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ +@@ -2788,17 +2796,27 @@ convert_tramp_reference_op (tree *tp, int *walk_subtrees, void *data) - void -@@ -45,9 +45,9 @@ f2 (int i, ...) - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ - - /* Here va_arg can be executed at most as many times as va_start. -@@ -69,9 +69,9 @@ f3 (int i, ...) - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 1 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ + /* Compute the address of the field holding the trampoline. */ + x = get_frame_field (info, target_context, x, &wi->gsi); +- x = build_addr (x); +- x = gsi_gimplify_val (info, x, &wi->gsi); - void -@@ -91,7 +91,7 @@ f4 (int i, ...) - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 8 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and 16 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and 16 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ --/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* aarch64-apple-darwin* } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ -diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c -index c8ad4fe320d..b0484f2f053 100644 ---- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c -+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c -@@ -25,7 +25,8 @@ f1 (int i, ...) - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - void - f2 (int i, ...) -@@ -39,7 +40,8 @@ f2 (int i, ...) - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - /* Here va_arg can be executed at most as many times as va_start. */ - void -@@ -58,7 +60,8 @@ f3 (int i, ...) - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 32 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 1 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - void - f4 (int i, ...) -@@ -77,7 +80,8 @@ f4 (int i, ...) - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 16 GPR units and 16 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 24 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 2 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 24 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 24 GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - void - f5 (int i, ...) -@@ -92,7 +96,8 @@ f5 (int i, ...) - /* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 32 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save (4|2) GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR units and 0 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR units and 0 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f5: va_list escapes 0, needs to save 16 GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - void - f6 (int i, ...) -@@ -107,7 +112,8 @@ f6 (int i, ...) - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 8 GPR units and 32 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 32 GPR units and 3" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|2) GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 8 GPR units and 32 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 8 GPR units and 32 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ - - void - f7 (int i, ...) -@@ -122,4 +128,5 @@ f7 (int i, ...) - /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR units and 64 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 32 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ - /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 2 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ --/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR units and 64 FPR units" "stdarg" { target aarch64*-*-* } } } */ -+/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR units and 64 FPR units" "stdarg" { target { { aarch64*-*-* } && { ! aarch64-apple-darwin* } } } } } */ -+/* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 32 GPR units" "stdarg" { target aarch64-apple-darwin* } } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp b/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp -index 3e652c483c7..34907929bda 100644 ---- a/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp -+++ b/gcc/testsuite/gcc.target/aarch64/aapcs64/aapcs64.exp -@@ -25,6 +25,11 @@ if { ![istarget aarch64*-*-*] } then { - return - } - -+if { [istarget *-*-darwin*] } then { -+ # darwinpcs and mach-o will need different test mechanisms. -+ return -+} -+ - torture-init - set-torture-options $C_TORTURE_OPTIONS - set additional_flags "-W -Wall -Wno-abi" -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_dup.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_dup.c -index c42c7acbbe9..76917a6ff5b 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_dup.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_dup.c -@@ -1,4 +1,5 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-options "-O2" } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_get.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_get.c -index 2193753ffbb..d29b222b032 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_get.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_get.c -@@ -1,4 +1,5 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_reinterpret.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_reinterpret.c -index f5adf40c648..4e3a3d94416 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_reinterpret.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bf16_reinterpret.c -@@ -1,4 +1,5 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-compile.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-compile.c -index 47af7c494d9..a2f415f67b7 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-compile.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-compile.c -@@ -1,4 +1,5 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-nosimd.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-nosimd.c -index a914680937d..c6b2ef3e444 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-nosimd.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvt-nosimd.c -@@ -2,7 +2,7 @@ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - /* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-additional-options "-save-temps -march=armv8.2-a+bf16+nosimd" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - - #include - -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvtnq2-untied.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvtnq2-untied.c -index 4b730e39d4e..fd2abadb457 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvtnq2-untied.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfcvtnq2-untied.c -@@ -1,8 +1,9 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - - #include -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-1.c -index ad51507731b..e57053d2193 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-1.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-1.c -@@ -1,8 +1,9 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - - #include -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-2.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-2.c -index ae0a953f7b4..9f5669a8974 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfdot-2.c -@@ -3,7 +3,7 @@ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-mbig-endian --save-temps" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - - #include -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmlalbt-compile.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmlalbt-compile.c -index 9810e4ba374..315cabd464b 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmlalbt-compile.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmlalbt-compile.c -@@ -1,8 +1,9 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ --/* { dg-final { check-function-bodies "**" "" "-DCHECK_ASM" } } */ -+/* { dg-final { check-function-bodies "**" "" "-DCHECK_ASM" { target { ! aarch64*-*-darwin* } } } } */ - - #include - -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmmla-compile.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmmla-compile.c -index 0aaa69f0037..ddc391b1332 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmmla-compile.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/bfmmla-compile.c -@@ -1,8 +1,9 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target aarch64_asm_bf16_ok } */ - /* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */ - /* { dg-add-options arm_v8_2a_bf16_neon } */ - /* { dg-additional-options "-save-temps" } */ --/* { dg-final { check-function-bodies "**" "" "-DCHECK_ASM" } } */ -+/* { dg-final { check-function-bodies "**" "" "-DCHECK_ASM" { target { ! aarch64*-*-darwin* } } } } */ - - #include - -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c -index ac4f821e771..978eac29815 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c -@@ -1,8 +1,9 @@ - /* { dg-do assemble { target { aarch64*-*-* } } } */ -+/* { dg-require-effective-target arm_v8_2a_i8mm_neon_hw } */ - /* { dg-require-effective-target arm_v8_2a_i8mm_ok } */ - /* { dg-add-options arm_v8_2a_i8mm } */ - /* { dg-additional-options "-save-temps" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - - #include -diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-2.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-2.c -index 61c7c51f5ec..f84ed68e2f7 100644 ---- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-2.c -@@ -3,7 +3,7 @@ - /* { dg-require-effective-target arm_v8_2a_i8mm_ok } */ - /* { dg-add-options arm_v8_2a_i8mm } */ - /* { dg-additional-options "-mbig-endian -save-temps" } */ --/* { dg-final { check-function-bodies "**" "" {-O[^0]} } } */ -+/* { dg-final { check-function-bodies "**" "" {-O[^0]} { target { ! aarch64*-*-darwin* } } } } */ - /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */ - - #include -diff --git a/gcc/testsuite/gcc.target/aarch64/arm_align_max_pwr.c b/gcc/testsuite/gcc.target/aarch64/arm_align_max_pwr.c -index ffa4d229922..38b9ef01eb7 100644 ---- a/gcc/testsuite/gcc.target/aarch64/arm_align_max_pwr.c -+++ b/gcc/testsuite/gcc.target/aarch64/arm_align_max_pwr.c -@@ -19,5 +19,7 @@ dummy () - return result; - } - --/* { dg-final { scan-assembler-times "zero\t4" 2 } } */ --/* { dg-final { scan-assembler "zero\t268435452" } } */ -+/* { dg-final { scan-assembler-times "zero\t4" 2 { target { ! *-*-darwin* } } } } */ -+/* { dg-final { scan-assembler "zero\t268435452" { target { ! *-*-darwin*} } } } */ -+/* { dg-final { scan-assembler-times ".zerofill __DATA,__bss,_y,4,28" 1 { target { *-*-darwin* } } } } */ -+/* { dg-final { scan-assembler-times ".zerofill __DATA,__bss,_x,4,28" 1 { target { *-*-darwin* } } } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/auto-init-2.c b/gcc/testsuite/gcc.target/aarch64/auto-init-2.c -index 375befd325b..3a0387a5952 100644 ---- a/gcc/testsuite/gcc.target/aarch64/auto-init-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/auto-init-2.c -@@ -12,11 +12,11 @@ enum E { - N3 - }; - --extern void bar (char, short, int, enum E, long, long long, int *, bool); -+extern void bar (unsigned char, short, int, enum E, long, long long, int *, bool); - - void foo() - { -- char temp1; -+ unsigned char temp1; - short temp2; - int temp3; - enum E temp4; -diff --git a/gcc/testsuite/gcc.target/aarch64/auto-init-3.c b/gcc/testsuite/gcc.target/aarch64/auto-init-3.c -index 7008f76b294..85a4e4daeb6 100644 ---- a/gcc/testsuite/gcc.target/aarch64/auto-init-3.c -+++ b/gcc/testsuite/gcc.target/aarch64/auto-init-3.c -@@ -2,13 +2,19 @@ - /* { dg-do compile } */ - /* { dg-options "-ftrivial-auto-var-init=zero -fdump-rtl-expand" } */ - --long double result; -+#ifdef __APPLE__ -+# define TYPE _Float128 -+#else -+# define TYPE long double -+#endif - --long double foo() -+TYPE result; +- /* Do machine-specific ugliness. Normally this will involve +- computing extra alignment, but it can really be anything. */ +- if (descr) +- builtin = builtin_decl_implicit (BUILT_IN_ADJUST_DESCRIPTOR); ++ /* APB: We don't need to do the adjustment calls when using off-stack ++ trampolines, any such adjustment will be done when the off-stack ++ trampoline is created. */ ++ if (!descr && flag_off_stack_trampolines) ++ x = gsi_gimplify_val (info, x, &wi->gsi); + else +- builtin = builtin_decl_implicit (BUILT_IN_ADJUST_TRAMPOLINE); +- call = gimple_build_call (builtin, 1, x); +- x = init_tmp_var_with_call (info, &wi->gsi, call); ++ { ++ x = build_addr (x); + -+TYPE foo() - { - float temp1; - double temp2; -- long double temp3; -+ TYPE temp3; - - result = temp1 + temp2 + temp3; - return result; -diff --git a/gcc/testsuite/gcc.target/aarch64/auto-init-4.c b/gcc/testsuite/gcc.target/aarch64/auto-init-4.c -index 10197045b4c..0c6840ba224 100644 ---- a/gcc/testsuite/gcc.target/aarch64/auto-init-4.c -+++ b/gcc/testsuite/gcc.target/aarch64/auto-init-4.c -@@ -2,13 +2,19 @@ - /* { dg-do compile } */ - /* { dg-options "-O -ftrivial-auto-var-init=pattern -fdump-rtl-expand" } */ - --long double result; -+#ifdef __APPLE__ -+# define TYPE _Float128 -+#else -+# define TYPE long double -+#endif - --long double foo() -+TYPE result; ++ x = gsi_gimplify_val (info, x, &wi->gsi); + -+TYPE foo() - { - float temp1; - double temp2; -- long double temp3; -+ TYPE temp3; - - result = temp1 + temp2 + temp3; - return result; -diff --git a/gcc/testsuite/gcc.target/aarch64/auto-init-5.c b/gcc/testsuite/gcc.target/aarch64/auto-init-5.c -index ac69ac3df82..0dda3c201d3 100644 ---- a/gcc/testsuite/gcc.target/aarch64/auto-init-5.c -+++ b/gcc/testsuite/gcc.target/aarch64/auto-init-5.c -@@ -2,14 +2,19 @@ - /* { dg-do compile } */ - /* { dg-options "-ftrivial-auto-var-init=zero" } */ - -+#ifdef __APPLE__ -+# define TYPE _Float128 -+#else -+# define TYPE long double -+#endif - --_Complex long double result; -+_Complex TYPE result; - --_Complex long double foo() -+_Complex TYPE foo() - { - _Complex float temp1; - _Complex double temp2; -- _Complex long double temp3; -+ _Complex TYPE temp3; - - result = temp1 + temp2 + temp3; - return result; -diff --git a/gcc/testsuite/gcc.target/aarch64/auto-init-6.c b/gcc/testsuite/gcc.target/aarch64/auto-init-6.c -index 0456c66f496..23323115a11 100644 ---- a/gcc/testsuite/gcc.target/aarch64/auto-init-6.c -+++ b/gcc/testsuite/gcc.target/aarch64/auto-init-6.c -@@ -2,14 +2,19 @@ - /* { dg-do compile } */ - /* { dg-options "-ftrivial-auto-var-init=pattern" } */ - -+#ifdef __APPLE__ -+# define TYPE _Float128 -+#else -+# define TYPE long double -+#endif - --_Complex long double result; -+_Complex TYPE result; ++ /* Do machine-specific ugliness. Normally this will involve ++ computing extra alignment, but it can really be anything. */ ++ if (descr) ++ builtin = builtin_decl_implicit (BUILT_IN_ADJUST_DESCRIPTOR); ++ else ++ builtin = builtin_decl_implicit (BUILT_IN_ADJUST_TRAMPOLINE); ++ call = gimple_build_call (builtin, 1, x); ++ x = init_tmp_var_with_call (info, &wi->gsi, call); ++ } --_Complex long double foo() -+_Complex TYPE foo() + /* Cast back to the proper function type. */ + x = build1 (NOP_EXPR, TREE_TYPE (t), x); +@@ -3377,6 +3395,7 @@ build_init_call_stmt (struct nesting_info *info, tree decl, tree field, + static void + finalize_nesting_tree_1 (struct nesting_info *root) { - _Complex float temp1; - _Complex double temp2; -- _Complex long double temp3; -+ _Complex TYPE temp3; - - result = temp1 + temp2 + temp3; - return result; -diff --git a/gcc/testsuite/gcc.target/aarch64/c-output-template-2.c b/gcc/testsuite/gcc.target/aarch64/c-output-template-2.c -index ced96d04542..86e4f5fa82c 100644 ---- a/gcc/testsuite/gcc.target/aarch64/c-output-template-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/c-output-template-2.c -@@ -6,4 +6,4 @@ test (void) - __asm__ ("@ %c0" : : "S" (test)); - } - --/* { dg-final { scan-assembler "@ test" } } */ -+/* { dg-final { scan-assembler "@ _?test" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/c-output-template-3.c b/gcc/testsuite/gcc.target/aarch64/c-output-template-3.c -index 8bde4cbeb0c..4531a381518 100644 ---- a/gcc/testsuite/gcc.target/aarch64/c-output-template-3.c -+++ b/gcc/testsuite/gcc.target/aarch64/c-output-template-3.c -@@ -7,4 +7,4 @@ test (void) - __asm__ ("@ %c0" : : "S" (&test + 4)); - } - --/* { dg-final { scan-assembler "@ test\\+4" } } */ -+/* { dg-final { scan-assembler "@ _?test\\+4" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/c-output-template-4.c b/gcc/testsuite/gcc.target/aarch64/c-output-template-4.c -index c5a93915af1..800d52bfab8 100644 ---- a/gcc/testsuite/gcc.target/aarch64/c-output-template-4.c -+++ b/gcc/testsuite/gcc.target/aarch64/c-output-template-4.c -@@ -7,4 +7,4 @@ test (void) - __asm__ ("@ %c0" : : "S" (&test + 4)); - } ++ gimple_seq cleanup_list = NULL; + gimple_seq stmt_list = NULL; + gimple *stmt; + tree context = root->context; +@@ -3508,9 +3527,48 @@ finalize_nesting_tree_1 (struct nesting_info *root) + if (!field) + continue; --/* { dg-final { scan-assembler "@ test\\+4" } } */ -+/* { dg-final { scan-assembler "@ _?test\\+4" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/cpymem-size.c b/gcc/testsuite/gcc.target/aarch64/cpymem-size.c -index 4a6f2495d22..b8ef4745c6d 100644 ---- a/gcc/testsuite/gcc.target/aarch64/cpymem-size.c -+++ b/gcc/testsuite/gcc.target/aarch64/cpymem-size.c -@@ -6,7 +6,7 @@ - /* - ** cpy_127: - ** mov (w|x)2, 127 --** b memcpy -+** b _?memcpy - */ - void - cpy_127 (char *out, char *in) -@@ -17,7 +17,7 @@ cpy_127 (char *out, char *in) - /* - ** cpy_128: - ** mov (w|x)2, 128 --** b memcpy -+** b _?memcpy - */ - void - cpy_128 (char *out, char *in) -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/aarch64-darwin.exp b/gcc/testsuite/gcc.target/aarch64/darwin/aarch64-darwin.exp -new file mode 100644 -index 00000000000..b0b7f49aede ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/aarch64-darwin.exp -@@ -0,0 +1,46 @@ -+# Specific tests for the darwinpcs and codegen. -+# Copyright (C) GNU Toolchain Authors -+# Contributed by Iain Sandoe -+# -+# This file is part of GCC. -+# -+# GCC is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+# -+# GCC 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 -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GCC; see the file COPYING3. If not see -+# . */ -+ -+# GCC testsuite that uses the `dg.exp' driver. -+ -+# Exit immediately if this isn't aarch64-darwin. -+ -+if { ![istarget aarch64*-*-darwin*] } then { -+ return -+} +- x = builtin_decl_implicit (BUILT_IN_INIT_TRAMPOLINE); +- stmt = build_init_call_stmt (root, i->context, field, x); +- gimple_seq_add_stmt (&stmt_list, stmt); ++ if (flag_off_stack_trampolines) ++ { ++ /* We pass a whole bunch of arguments to the builtin function that ++ creates the off-stack trampoline, these are ++ 1. The nested function chain value (that must be passed to the ++ nested function so it can find the function arguments). ++ 2. A pointer to the nested function implementation, ++ 3. The address in the local stack frame where we should write ++ the address of the trampoline. + -+# Load support procs. -+load_lib gcc-dg.exp ++ When this code was originally written I just kind of threw ++ everything at the builtin, figuring I'd work out what was ++ actually needed later, I think, the stack pointer could ++ certainly be dropped, arguments #2 and #4 are based off the ++ stack pointer anyway, so #1 doesn't seem to add much value. */ ++ tree arg1, arg2, arg3; + -+# If a testcase doesn't have special options, use these. -+global DEFAULT_CFLAGS -+if ![info exists DEFAULT_CFLAGS] then { -+ set DEFAULT_CFLAGS " -ansi -pedantic-errors" -+} ++ gcc_assert (DECL_STATIC_CHAIN (i->context)); ++ arg1 = build_addr (root->frame_decl); ++ arg2 = build_addr (i->context); + -+# Initialize `dg'. -+dg-init ++ x = build3 (COMPONENT_REF, TREE_TYPE (field), ++ root->frame_decl, field, NULL_TREE); ++ arg3 = build_addr (x); + -+# Main loop. -+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cCS\]]] \ -+ "" $DEFAULT_CFLAGS ++ x = builtin_decl_implicit (BUILT_IN_NESTED_PTR_CREATED); ++ stmt = gimple_build_call (x, 3, arg1, arg2, arg3); ++ gimple_seq_add_stmt (&stmt_list, stmt); + -+# All done. -+dg-finish -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/complex-in-regs.c b/gcc/testsuite/gcc.target/aarch64/darwin/complex-in-regs.c -new file mode 100644 -index 00000000000..974f02ca2ec ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/complex-in-regs.c -@@ -0,0 +1,103 @@ -+/* { dg-do compile } */ -+/* we need this for complex and gnu initializers. */ -+/* { dg-options "-std=gnu99 " } */ -+/* We use the sections anchors to make the code easier to match. */ -+/* { dg-additional-options " -O -fsection-anchors -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+ -+__attribute__((__noinline__)) -+_Complex char -+cc_regs_fun (_Complex char r0, _Complex char r1, -+ _Complex char r2, _Complex char r3, -+ _Complex char r4, _Complex char r5, -+ _Complex char r6, _Complex char r7); -+ -+/* -+**call_cc_regs_fun: -+** ... -+** ldrh w7, \[x0\] -+** ldrh w6, \[x0, 2\] -+** ldrh w5, \[x0, 4\] -+** ldrh w4, \[x0, 6\] -+** ldrh w3, \[x0, 8\] -+** ldrh w2, \[x0, 10\] -+** ldrh w1, \[x0, 12\] -+** ldrh w0, \[x0, 14]\ -+** bl _cc_regs_fun -+** ... -+*/ -+ -+_Complex char -+call_cc_regs_fun (void) -+{ -+ return cc_regs_fun ((_Complex char) (1 + 1i), (_Complex char) (2 + 2i), -+ (_Complex char) (3 + 3i), (_Complex char) (4 + 4i), -+ (_Complex char) (5 + 5i), (_Complex char) (6 + 6i), -+ (_Complex char) (7 + 7i), (_Complex char) (8 + 8i)); -+} ++ /* This call to delete the nested function trampoline is added to ++ the cleanup list, and called when we exit the current scope. */ ++ x = builtin_decl_implicit (BUILT_IN_NESTED_PTR_DELETED); ++ stmt = gimple_build_call (x, 0); ++ gimple_seq_add_stmt (&cleanup_list, stmt); ++ } ++ else ++ { ++ /* Original code to initialise the on stack trampoline. */ ++ x = builtin_decl_implicit (BUILT_IN_INIT_TRAMPOLINE); ++ stmt = build_init_call_stmt (root, i->context, field, x); ++ gimple_seq_add_stmt (&stmt_list, stmt); ++ } + } + } + +@@ -3535,11 +3593,40 @@ finalize_nesting_tree_1 (struct nesting_info *root) + /* If we created initialization statements, insert them. */ + if (stmt_list) + { +- gbind *bind; +- annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); +- bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); +- gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); +- gimple_bind_set_body (bind, stmt_list); ++ if (flag_off_stack_trampolines) ++ { ++ /* Handle the new, off stack trampolines. */ ++ gbind *bind; ++ annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); ++ annotate_all_with_location (cleanup_list, DECL_SOURCE_LOCATION (context)); ++ bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); ++ gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); + ++ gimple_seq xxx_list = NULL; + -+__attribute__((__noinline__)) -+_Complex short -+cs_regs_fun (_Complex short r0, _Complex short r1, -+ _Complex short r2, _Complex short r3, -+ _Complex short r4, _Complex short r5, -+ _Complex short r6, _Complex short r7); -+ -+/* -+**call_cs_regs_fun: -+** ... -+** ldr w7, \[x0, 16\] -+** ldr w6, \[x0, 20\] -+** ldr w5, \[x0, 24\] -+** ldr w4, \[x0, 28\] -+** ldr w3, \[x0, 32\] -+** ldr w2, \[x0, 36\] -+** ldr w1, \[x0, 40\] -+** ldr w0, \[x0, 44\] -+** bl _cs_regs_fun -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Complex short -+call_cs_regs_fun (void) -+{ -+ return cs_regs_fun ((_Complex short) (1 + 1i), (_Complex short) (2 + 2i), -+ (_Complex short) (3 + 3i), (_Complex short) (4 + 4i), -+ (_Complex short) (5 + 5i), (_Complex short) (6 + 6i), -+ (_Complex short) (7 + 7i), (_Complex short) (8 + 8i)); -+} ++ if (cleanup_list != NULL) ++ { ++ /* We Maybe shouldn't be creating this try/finally if -fno-exceptions is ++ in use. If this is the case, then maybe we should, instead, be ++ inserting the cleanup code onto every path out of this function? Not ++ yet figured out how we would do this. */ ++ gtry *t = gimple_build_try (stmt_list, cleanup_list, GIMPLE_TRY_FINALLY); ++ gimple_seq_add_stmt (&xxx_list, t); ++ } ++ else ++ xxx_list = stmt_list; + -+__attribute__((__noinline__)) -+_Complex int -+ci_regs_fun (_Complex int r0, _Complex int r1, -+ _Complex int r2, _Complex int r3, -+ _Complex int r4, _Complex int r5, -+ _Complex int r6, _Complex int r7); -+ -+/* -+**call_ci_regs_fun: -+** ... -+** ldr x7, \[x0, 48\] -+** ldr x6, \[x0, 56\] -+** ldr x5, \[x0, 64\] -+** ldr x4, \[x0, 72\] -+** ldr x3, \[x0, 80\] -+** ldr x2, \[x0, 88\] -+** ldr x1, \[x0, 96\] -+** ldr x0, \[x0, 104\] -+** bl _ci_regs_fun -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Complex int -+call_ci_regs_fun (void) -+{ -+ return ci_regs_fun ((_Complex int) (1 + 1i), (_Complex int) (2 + 2i), -+ (_Complex int) (3 + 3i), (_Complex int) (4 + 4i), -+ (_Complex int) (5 + 5i), (_Complex int) (6 + 6i), -+ (_Complex int) (7 + 7i), (_Complex int) (8 + 8i)); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d1.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d1.c -new file mode 100644 -index 00000000000..e2dd574fac7 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d1.c -@@ -0,0 +1,54 @@ -+/* { dg-do compile } */ -+/* we need this for the empty struct. */ -+/* { dg-options "-std=gnu99 " } */ -+/* { dg-additional-options "-O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* Make sure we do no consume any registers in passing zero-sized entities */ -+ -+typedef struct es {} Empty; -+ -+__attribute__((__noinline__)) void -+use_no_regs (int a, Empty b, int c, Empty d, Empty e, int f); -+ -+/* -+**call_use_no_regs: -+** ... -+** mov w2, 3 -+** mov w1, 2 -+** mov w0, 1 -+** bl _use_no_regs -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+call_use_no_regs (void) -+{ -+ Empty e; -+ use_no_regs (1, e, 2, e, e, 3); -+} ++ gimple_bind_set_body (bind, xxx_list); ++ } ++ else ++ { ++ /* The traditional, on stack trampolines. */ ++ gbind *bind; ++ annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); ++ bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); ++ gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); ++ gimple_bind_set_body (bind, stmt_list); ++ } + } + + /* If a chain_decl was created, then it needs to be registered with +diff --git a/gcc/tree.cc b/gcc/tree.cc +index 207293c48cb..0a4770ec801 100644 +--- a/gcc/tree.cc ++++ b/gcc/tree.cc +@@ -9852,6 +9852,23 @@ build_common_builtin_nodes (void) + "__builtin_nonlocal_goto", + ECF_NORETURN | ECF_NOTHROW); + ++ tree ptr_ptr_type_node = build_pointer_type (ptr_type_node); + -+/* Make sure we consume no stack in passing zero-sized entities. */ ++ ftype = build_function_type_list (void_type_node, ++ ptr_type_node, // void *chain ++ ptr_type_node, // void *func ++ ptr_ptr_type_node, // void **dst ++ NULL_TREE); ++ local_define_builtin ("__builtin_nested_func_ptr_created", ftype, ++ BUILT_IN_NESTED_PTR_CREATED, ++ "__builtin_nested_func_ptr_created", ECF_NOTHROW); + -+/* -+**call_use_no_stack: -+** ... -+** mov w[0-9]+, 108 -+** strb w[0-9]+, \[sp, 1\] -+** mov w[0-9]+, 106 -+** strb w[0-9]+, \[sp\] -+** ... -+** bl _use_no_stack -+** ... -+*/ ++ ftype = build_function_type_list (void_type_node, ++ NULL_TREE); ++ local_define_builtin ("__builtin_nested_func_ptr_deleted", ftype, ++ BUILT_IN_NESTED_PTR_DELETED, ++ "__builtin_nested_func_ptr_deleted", ECF_NOTHROW); + -+__attribute__((__noinline__)) void -+use_no_stack (int a, int b, int c, int d, int e, int f, int g, int h, -+ Empty i, char j, Empty k, char l); + ftype = build_function_type_list (void_type_node, + ptr_type_node, ptr_type_node, NULL_TREE); + local_define_builtin ("__builtin_setjmp_setup", ftype, +diff --git a/gotools/Makefile.in b/gotools/Makefile.in +index 2783b91ef4b..9739a79526b 100644 +--- a/gotools/Makefile.in ++++ b/gotools/Makefile.in +@@ -704,8 +704,8 @@ distclean-generic: + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +-@NATIVE_FALSE@install-exec-local: + @NATIVE_FALSE@uninstall-local: ++@NATIVE_FALSE@install-exec-local: + clean: clean-am + + clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ +diff --git a/intl/Makefile.in b/intl/Makefile.in +index 409d693c48e..5beebdc152c 100644 +--- a/intl/Makefile.in ++++ b/intl/Makefile.in +@@ -54,7 +54,7 @@ CTAGS = @CTAGS@ + ETAGS = @ETAGS@ + MKID = @MKID@ + +-COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(DEFS-$@) $(INCLUDES) ++COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) @PICFLAG@ $(DEFS) $(DEFS-$@) $(INCLUDES) + + HEADERS = \ + gmo.h \ +diff --git a/intl/configure b/intl/configure +index 03f40487a92..79bb5831a47 100755 +--- a/intl/configure ++++ b/intl/configure +@@ -623,6 +623,8 @@ ac_header_list= + ac_subst_vars='LTLIBOBJS + LIBOBJS + PICFLAG ++enable_host_pie ++enable_host_shared + BISON3_NO + BISON3_YES + INCINTL +@@ -731,6 +733,7 @@ with_libintl_prefix + with_libintl_type + enable_maintainer_mode + enable_host_shared ++enable_host_pie + ' + ac_precious_vars='build_alias + host_alias +@@ -1356,6 +1359,7 @@ Optional Features: + --disable-rpath do not hardcode runtime library paths + --enable-maintainer-mode enable rules only needed by maintainers + --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -6852,15 +6856,31 @@ fi + + + ++# Enable --enable-host-shared. + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC ++ enableval=$enable_host_shared; ++fi + -+void -+call_use_no_stack (void) -+{ -+ Empty e; -+ use_no_stack (0, 1, 2, 3, 4, 5, 6, 7, e, 'j', e, 'l'); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-00.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-00.c -new file mode 100644 -index 00000000000..bd76856308b ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-00.c -@@ -0,0 +1,126 @@ -+/* { dg-do compile } */ -+/* { dg-additional-options " -O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* In each case we consume the parm registers with 8 ints, forcing -+ the test values to be spilled to the stack. */ -+ -+/* The important thing here is that the chars are assigned to the stack -+ * with no padding - so that they occupy bytes 0-8. */ -+ -+/* -+**call_char_packing: -+** ... -+** mov w[0-9]+, 113 -+** strb w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 112 -+** strb w[0-9]+, \[sp, 7\] -+** mov w[0-9]+, 111 -+** strb w[0-9]+, \[sp, 6\] -+** mov w[0-9]+, 110 -+** strb w[0-9]+, \[sp, 5\] -+** mov w[0-9]+, 109 -+** strb w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 108 -+** strb w[0-9]+, \[sp, 3\] -+** mov w[0-9]+, 107 -+** strb w[0-9]+, \[sp, 2\] -+** mov w[0-9]+, 106 -+** strb w[0-9]+, \[sp, 1\] -+** mov w[0-9]+, 105 -+** strb w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _char_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+char_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ char i, char j, char k, char l, -+ char m, char n, char o, char p, -+ char q); -+ -+void call_char_packing (void) -+{ -+ char_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q'); -+} + -+/* Here we should occupy the first 7 short words on the stack. */ -+ -+/* -+**call_short_packing: -+** ... -+** mov w[0-9]+, 12 -+** strh w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 11 -+** strh w[0-9]+, \[sp, 6\] -+** mov w[0-9]+, 10 -+** strh w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 9 -+** strh w[0-9]+, \[sp, 2\] -+** mov w[0-9]+, 8 -+** strh w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _short_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+short_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ short i, short j, short k, short l, -+ short m); -+ -+void call_short_packing (void) -+{ -+ short_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 8, 9, 10, 11, 12); -+} + -+/* Here we should occupy the first 3 ints on the stack. */ -+ -+/* -+**call_int_packing: -+** ... -+** mov w[0-9]+, 10 -+** str w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 9 -+** str w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 8 -+** str w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _int_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+int_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ int i, int j, int k); -+ -+void call_int_packing (void) -+{ -+ int_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 8, 9, 10); -+} ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; ++fi + -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-01.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-01.c -new file mode 100644 -index 00000000000..d21fd551b4a ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-01.c -@@ -0,0 +1,115 @@ -+/* { dg-do compile } */ -+/* { dg-additional-options " -O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* In each case we consume the parm registers with 8 ints, forcing -+ the test values to be spilled to the stack. */ -+ -+/* char short char short - everything on 2byte boundaries */ -+ -+/* -+**call_c_s_packing: -+** ... -+** mov w[0-9]+, 109 -+** strb w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 9 -+** strh w[0-9]+, \[sp, 6\] -+** mov w[0-9]+, 107 -+** strb w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 8 -+** strh w[0-9]+, \[sp, 2\] -+** mov w[0-9]+, 105 -+** strb w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _c_s_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+c_s_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ char i, short j, char k, short l, -+ char m); -+ -+void call_c_s_packing (void) -+{ -+ c_s_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 'i', 8 , 'k', 9, 'm'); -+} + -+/* -+**call_s_c_packing: -+** ... -+** mov w[0-9]+, 109 -+** strb w[0-9]+, \[sp, 7\] -+** mov w[0-9]+, 108 -+** strb w[0-9]+, \[sp, 6\] -+** mov w[0-9]+, 9 -+** strh w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 106 -+** strb w[0-9]+, \[sp, 2\] -+** mov w[0-9]+, 8 -+** strh w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _s_c_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+s_c_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ short i, char j, short k, char l, -+ char m); -+ -+void call_s_c_packing (void) -+{ -+ s_c_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 8, 'j' , 9, 'l', 'm'); -+} + -+/* 0, 2, 4, 0 */ -+ -+/* -+**call_csi_packing: -+** ... -+** mov w[0-9]+, 108 -+** strb w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 9 -+** str w[0-9]+, \[sp, 4\] -+** mov w[0-9]+, 8 -+** strh w[0-9]+, \[sp, 2\] -+** mov w[0-9]+, 105 -+** strb w[0-9]+, \[sp\] -+** mov w7, 7 -+** mov w6, 6 -+** mov w5, 5 -+** mov w4, 4 -+** mov w3, 3 -+** mov w2, 2 -+** mov w1, 1 -+** mov w0, 0 -+** bl _csi_packing -+** ... -+*/ -+ -+__attribute__((__noinline__)) void -+csi_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ char i, short j, int k, char l); -+ -+void call_csi_packing (void) -+{ -+ csi_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ 'i', 8 , 9, 'l'); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-02.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-02.c -new file mode 100644 -index 00000000000..55e5acdaf41 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-02.c -@@ -0,0 +1,75 @@ -+/* { dg-do compile } */ -+/* we need this for complex literals. */ -+/* { dg-options "-std=gnu99 " } */ -+/* { dg-additional-options "-O -fsection-anchors -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+ -+__attribute__((__noinline__)) void -+c_cc_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ _Complex char i, _Complex char j); -+ -+/* We check that these values are not packed on the stack. -+**call_c_cc_packing: -+** ... -+** ldrh w[0-9]+, \[x[0-9]+\] -+** strh w[0-9]+, \[sp, 8\] -+** ldrh w[0-9]+, \[x[0-9]+, 2\] -+** strh w[0-9]+, \[sp\] -+** ... -+** bl _c_cc_packing -+** ... -+*/ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE + else + PICFLAG= + fi + + +- + ac_config_files="$ac_config_files Makefile config.intl" + + cat >confcache <<\_ACEOF +diff --git a/intl/configure.ac b/intl/configure.ac +index 16a740aa230..81aa831f59f 100644 +--- a/intl/configure.ac ++++ b/intl/configure.ac +@@ -83,10 +83,25 @@ fi + AC_SUBST(BISON3_YES) + AC_SUBST(BISON3_NO) + ++# Enable --enable-host-shared. + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) ++ [build host code as shared libraries])]) ++AC_SUBST(enable_host_shared) ++ ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi + AC_SUBST(PICFLAG) + + AC_CONFIG_FILES(Makefile config.intl) +diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am +index c6c8d81c56a..d18738cd7e6 100644 +--- a/libatomic/Makefile.am ++++ b/libatomic/Makefile.am +@@ -65,8 +65,13 @@ libatomic_version_script = + libatomic_version_dep = + endif + libatomic_version_info = -version-info $(libtool_VERSION) ++if ENABLE_DARWIN_AT_RPATH ++libatomic_darwin_rpath = -Wc,-nodefaultrpaths ++libatomic_darwin_rpath += -Wl,-rpath,@loader_path ++endif + +-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags) ++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) \ ++ $(lt_host_flags) $(libatomic_darwin_rpath) + libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \ + fenv.c fence.c flag.c + +diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in +index a0fa3dfc8cc..155c9aa9255 100644 +--- a/libatomic/Makefile.in ++++ b/libatomic/Makefile.in +@@ -417,7 +417,12 @@ noinst_LTLIBRARIES = libatomic_convenience.la + @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = $(top_srcdir)/libatomic.map + @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = libatomic.map-sun + libatomic_version_info = -version-info $(libtool_VERSION) +-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags) ++@ENABLE_DARWIN_AT_RPATH_TRUE@libatomic_darwin_rpath = \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path ++libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) \ ++ $(lt_host_flags) $(libatomic_darwin_rpath) + -+void -+call_c_cc_packing (void) -+{ -+ c_cc_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ (_Complex char) (1 + 1i),(_Complex char) (2 + 2i)); -+} + libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c \ + init.c fenv.c fence.c flag.c $(am__append_2) + SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas +diff --git a/libatomic/configure b/libatomic/configure +index e47d2d7fb35..7c687b932e7 100755 +--- a/libatomic/configure ++++ b/libatomic/configure +@@ -658,6 +658,8 @@ OPT_LDFLAGS + SECTION_LDFLAGS + enable_aarch64_lse + libtool_VERSION ++ENABLE_DARWIN_AT_RPATH_FALSE ++ENABLE_DARWIN_AT_RPATH_TRUE + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +@@ -803,6 +805,7 @@ with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock ++enable_darwin_at_rpath + enable_maintainer_mode + enable_symvers + enable_werror +@@ -1452,6 +1455,8 @@ Optional Features: + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-darwin-at-path install libraries with @rpath/library-name, requires ++ rpaths to be added to executables + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer +@@ -7608,7 +7613,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9581,6 +9586,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) + + + ++ # Publish an arg to allow the user to select that Darwin host (and target) ++ # libraries should be given install-names like @rpath/libfoo.dylib. This ++ # requires that the user of the library then adds an 'rpath' to the DSO that ++ # needs access. ++ # NOTE: there are defaults below, for systems that support rpaths. The person ++ # configuring can override the defaults for any system version that supports ++ # them - they are, however, forced off for system versions without support. ++ # Check whether --enable-darwin-at-rpath was given. ++if test "${enable_darwin_at_rpath+set}" = set; then : ++ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then ++ # This is not supported before macOS 10.5 / Darwin9. ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} ++ enable_darwin_at_rpath=no ++ ;; ++ esac ++ fi ++else ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ # As above, before 10.5 / Darwin9 this does not work. ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ enable_darwin_at_rpath=no ++ ;; + -+__attribute__((__noinline__)) void -+c_cs_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ _Complex short i, _Complex short j); ++ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use ++ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key ++ # system executables (e.g. /bin/sh). Force rpaths on for these systems. ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} ++ enable_darwin_at_rpath=yes ++ ;; ++ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can ++ # work with either DYLD_LIBRARY_PATH or embedded rpaths. + -+/* -+**call_c_cs_packing: -+** ... -+** ldr w[0-9]+, \[x[0-9]+, 4\] -+** str w[0-9]+, \[sp, 8\] -+** ldr w[0-9]+, \[x[0-9]+, 8\] -+** str w[0-9]+, \[sp\] -+** ... -+** bl _c_cs_packing -+** ... -+*/ ++ esac + -+void -+call_c_cs_packing (void) -+{ -+ c_cs_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ (_Complex short) (1 + 1i),(_Complex short) (2 + 2i)); -+} ++fi + -+void c_ci_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ _Complex int i, _Complex int j); -+ -+/* -+**call_c_ci_packing: -+** ... -+** ldr x[0-9]+, \[x[0-9]+, 12\] -+** str x[0-9]+, \[sp, 8\] -+** ldr x[0-9]+, \[x[0-9]+, 20\] -+** str x[0-9]+, \[sp\] -+** ... -+** bl _c_ci_packing -+** ... -+*/ + -+void -+call_c_ci_packing (void) -+{ -+ c_ci_packing (0, 1, 2, 3, 4, 5, 6, 7, -+ (_Complex int) (1 + 1i),(_Complex int) (2 + 2i)); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-03.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-03.c -new file mode 100644 -index 00000000000..b0d2593dfd7 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-03.c -@@ -0,0 +1,67 @@ -+/* { dg-do compile } */ -+ -+/* { dg-additional-options "-O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+typedef union u { char a; short b; } U; -+typedef struct sf { float a; float b; float c;} SF; -+ -+__attribute__((__noinline__)) void -+u_packing (int a, int b, int c, int d, int e, int f, int g, int h, -+ U i, U j); -+ -+/* We check that these values are not packed on the stack. -+**call_u_packing: -+** ... -+** strh w[0-9]+, \[sp, 8\] -+** strh w[0-9]+, \[sp\] -+** ... -+** bl _u_packing -+** ... -+*/ + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes +@@ -9598,9 +9646,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else +@@ -11406,7 +11458,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11409 "configure" ++#line 11461 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11512,7 +11564,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11515 "configure" ++#line 11567 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11797,6 +11849,15 @@ fi + + + ++ if test x$enable_darwin_at_rpath = xyes; then ++ ENABLE_DARWIN_AT_RPATH_TRUE= ++ ENABLE_DARWIN_AT_RPATH_FALSE='#' ++else ++ ENABLE_DARWIN_AT_RPATH_TRUE='#' ++ ENABLE_DARWIN_AT_RPATH_FALSE= ++fi + -+void -+call_u_packing (void) -+{ -+ U x = { 'a' }; -+ u_packing (0, 1, 2, 3, 4, 5, 6, 7, x, x); -+} + -+/* But a homogeneous float aggregate is treated as if it were the contained -+ floats. */ -+ -+__attribute__((__noinline__)) void -+sf_packing (float a, float b, float c, float d, -+ float e, float f, float g, float h, -+ SF i, SF j); -+ -+/* So the stores to sp+12 and 20 pack the floats onto the stack. -+**call_sf_packing: -+** ... -+** fmov s1, 1.0e\+0 -+** str s1, \[sp, 48\] -+** fmov s2, 2.0e\+0 -+** str s2, \[sp, 52\] -+** mov w[0-9]+, 1077936128 -+** ldr x[0-9]+, \[sp, 48\] -+** str x[0-9]+, \[sp, 12\] -+** str w[0-9]+, \[sp, 20\] -+** str x[0-9]+, \[sp\] -+** str w[0-9]+, \[sp, 8\] -+** fmov s7, 7.0e\+0 -+** fmov s6, 6.0e\+0 -+** fmov s5, 5.0e\+0 -+** fmov s4, 4.0e\+0 -+** fmov s3, 3.0e\+0 -+** movi v0.2s, #0 -+** bl _sf_packing -+** ... -+*/ + # For libtool versioning info, format is CURRENT:REVISION:AGE + libtool_VERSION=3:0:2 + +@@ -15924,6 +15985,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then ++ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + + if test -z "${LIBAT_BUILD_VERSIONED_SHLIB_TRUE}" && test -z "${LIBAT_BUILD_VERSIONED_SHLIB_FALSE}"; then + as_fn_error $? "conditional \"LIBAT_BUILD_VERSIONED_SHLIB\" was never defined. +diff --git a/libatomic/configure.ac b/libatomic/configure.ac +index 31304685dbd..20981f16f70 100644 +--- a/libatomic/configure.ac ++++ b/libatomic/configure.ac +@@ -156,6 +156,8 @@ AC_SUBST(enable_shared) + AC_SUBST(enable_static) + AM_MAINTAINER_MODE + ++AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + -+void -+call_sf_packing (void) -+{ -+ SF A = {1.0F, 2.0F, 3.0F}; -+ sf_packing (0.0F, 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F, 7.0F, -+ A, A); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-04.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-04.c -new file mode 100644 -index 00000000000..33c60c69b78 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d2-04.c -@@ -0,0 +1,66 @@ -+/* { dg-do compile } */ -+ -+/* { dg-additional-options "-O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+typedef short v2hi __attribute__ ((vector_size (4))); -+typedef int v4si __attribute__ ((vector_size (16))); -+ -+v4si t; -+int al = __alignof__ (t); -+ -+__attribute__((__noinline__)) void -+v2hi_packing (v2hi a, v2hi b, v2hi c, v2hi d, v2hi e, v2hi f, v2hi g, v2hi h, -+ v2hi i, v2hi j); -+ -+/* We check that v2hi is packed on the stack. -+**call_v2hi_packing: -+** ... -+** mov w[0-9]+, 1 -+** movk w[0-9]+, 0x2, lsl 16 -+** str w[0-9]+, \[sp, 4\] -+** str w[0-9]+, \[sp\] -+** mov w7, w[0-9]+ -+** mov w6, w[0-9]+ -+** mov w5, w[0-9]+ -+** mov w4, w[0-9]+ -+** mov w3, w[0-9]+ -+** mov w2, w[0-9]+ -+** mov w1, w[0-9]+ -+** bl _v2hi_packing -+** ... -+*/ + # For libtool versioning info, format is CURRENT:REVISION:AGE + libtool_VERSION=3:0:2 + AC_SUBST(libtool_VERSION) +diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp +index 10f38475bc8..c6d645e9ae3 100644 +--- a/libatomic/testsuite/lib/libatomic.exp ++++ b/libatomic/testsuite/lib/libatomic.exp +@@ -148,11 +148,15 @@ proc libatomic_init { args } { + if { $blddir != "" } { + lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" + lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" +- lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" ++ if [istarget *-*-darwin*] { ++ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" ++ } else { ++ lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" ++ } + } + lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.." + +- if [istarget *-*-darwin*] { ++ if [istarget *-*-darwin\[89\]*] { + lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc" + } + +diff --git a/libbacktrace/configure b/libbacktrace/configure +index 6af2c04c81a..38b54957034 100755 +--- a/libbacktrace/configure ++++ b/libbacktrace/configure +@@ -681,6 +681,8 @@ PIC_FLAG + WARN_FLAGS + EXTRA_FLAGS + BACKTRACE_FILE ++ENABLE_DARWIN_AT_RPATH_FALSE ++ENABLE_DARWIN_AT_RPATH_TRUE + OTOOL64 + OTOOL + LIPO +@@ -805,6 +807,7 @@ with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock ++enable_darwin_at_rpath + enable_largefile + enable_cet + enable_werror +@@ -1453,6 +1456,8 @@ Optional Features: + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-darwin-at-path install libraries with @rpath/library-name, requires ++ rpaths to be added to executables + --disable-largefile omit support for large files + --enable-cet enable Intel CET in target libraries [default=auto] + --disable-werror disable building with -Werror +@@ -8010,7 +8015,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9716,6 +9721,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) + + + -+void -+call_v2hi_packing (void) -+{ -+ v2hi x = {1,2}; -+ v2hi_packing (x, x, x, x, x, x, x, x, x, x); -+} ++ # Publish an arg to allow the user to select that Darwin host (and target) ++ # libraries should be given install-names like @rpath/libfoo.dylib. This ++ # requires that the user of the library then adds an 'rpath' to the DSO that ++ # needs access. ++ # NOTE: there are defaults below, for systems that support rpaths. The person ++ # configuring can override the defaults for any system version that supports ++ # them - they are, however, forced off for system versions without support. ++ # Check whether --enable-darwin-at-rpath was given. ++if test "${enable_darwin_at_rpath+set}" = set; then : ++ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then ++ # This is not supported before macOS 10.5 / Darwin9. ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} ++ enable_darwin_at_rpath=no ++ ;; ++ esac ++ fi ++else ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ # As above, before 10.5 / Darwin9 this does not work. ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ enable_darwin_at_rpath=no ++ ;; + ++ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use ++ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key ++ # system executables (e.g. /bin/sh). Force rpaths on for these systems. ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} ++ enable_darwin_at_rpath=yes ++ ;; ++ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can ++ # work with either DYLD_LIBRARY_PATH or embedded rpaths. + -+__attribute__((__noinline__)) void -+v4si_packing (int r0, int r1, int r2, int r3, int r4, int r5, int r6, int r7, -+ v4si a, v4si b, v4si c, v4si d, v4si e, v4si f, v4si g, v4si h, -+ int stack, v4si i, v4si j); -+ -+/* Test that we align a 16b vector on the stack. -+**call_v4si_packing: -+** ... -+** adrp x0, lC0@PAGE -+** ldr q[0-9]+, \[x[0-9]+, #lC0@PAGEOFF\] -+** str q[0-9]+, \[sp, 32\] -+** str q[0-9]+, \[sp, 16\] -+** mov w[0-9]+, 42 -+** str w[0-9]+, \[sp\] -+** ... -+** bl _v4si_packing -+** ... -+*/ -+ -+void -+call_v4si_packing (void) -+{ -+ v4si x = {3,1,2,4}; -+ v4si_packing (0, 1, 2, 3, 4, 5, 6, 7, x, x, x, x, x, x, x, x, 42, x, x); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d3.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d3.c -new file mode 100644 -index 00000000000..21c6b696b7c ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d3.c -@@ -0,0 +1,40 @@ -+/* { dg-do compile } */ -+/* { dg-additional-options "-O " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* This will fail, because of issue #74 -+**foo: -+** cmp w0, w1 -+** cset w0, eq -+** ret -+*/ -+ -+__attribute__((__noinline__)) -+int -+foo (char a, unsigned char b) -+{ -+ return a == b ? 1 : 0; -+} -+ -+__attribute__((__noinline__)) -+int -+bar (short a, unsigned short b) -+{ -+ return a == b ? 1 : 0; -+} -+ -+void pop (char *, unsigned char *, short *, unsigned short *); -+ -+int main () -+{ -+ char a; -+ unsigned char b; -+ short c; -+ unsigned short d; -+ int result; -+ pop (&a, &b, &c, &d); -+ -+ result = foo (a, b); -+ result += bar (c, d); -+ return result; -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d4.c b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d4.c -new file mode 100644 -index 00000000000..2aab48260f4 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/darwinpcs-d4.c -@@ -0,0 +1,62 @@ -+/* { dg-do compile } */ -+/* we need this for __int128. */ -+/* { dg-options "-std=gnu99 " } */ -+/* { dg-additional-options "-O -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* we should use x0, x1 and x2 - not skip x1. -+**foo: -+** eor x0, x0, x1 -+** orr x0, x0, x2 -+** cmp x0, 0 -+** cset w0, eq -+** ret -+*/ -+ -+__attribute__((__noinline__)) -+int -+foo (unsigned long long x,unsigned __int128 y) -+{ -+ return x == y ? 1 : 0; -+} -+ -+/* we should use x0, x1 and x2. -+**bar: -+** eor x2, x2, x0 -+** orr x2, x2, x1 -+** cmp x2, 0 -+** cset w0, eq -+** ret -+*/ -+ -+__attribute__((__noinline__)) -+int -+bar (unsigned __int128 y, unsigned long long x) -+{ -+ return x == y ? 1 : 0; -+} -+ -+int fooo (unsigned long long x, unsigned __int128 y); -+int baro (unsigned __int128 y, unsigned long long x); -+ -+/* we should use x0, x1 and x2 in both calls. -+**main: -+** ... -+** mov x1, 25 -+** mov x2, 0 -+** mov x0, 10 -+** bl _fooo -+** mov x2, 10 -+** mov x0, 25 -+** mov x1, 0 -+** bl _baro -+** ... -+*/ -+ -+int main () -+{ -+ unsigned long long x = 10; -+ unsigned __int128 y = 25; -+ int r = fooo (x, y); -+ r += baro (y, x); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/float128-00.c b/gcc/testsuite/gcc.target/aarch64/darwin/float128-00.c -new file mode 100644 -index 00000000000..29aec80fbaa ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/float128-00.c -@@ -0,0 +1,38 @@ -+ -+/* we need this for _Float128. */ -+/* { dg-options "-std=gnu99 " } */ -+/* We use the sections anchors to make the code easier to match. */ -+/* { dg-additional-options " -O2 -fsection-anchors " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* we should just pass q0 and q1 through -+**foo: -+** ... -+** bl ___addtf3 -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+foo (_Float128 a, _Float128 b) -+{ -+ return a + b; -+} -+ -+ -+/* we should just load q0 and q1 -+**call_foo: -+** ... -+** ldr q1, \[x[0-9]+\] -+** ... -+** ldr q0, \[x[0-9]+\] -+** b _foo -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+call_foo (void) -+{ -+ return foo (1.0, 2.0); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/homogeneous-aggr.c b/gcc/testsuite/gcc.target/aarch64/darwin/homogeneous-aggr.c -new file mode 100644 -index 00000000000..bee97557a4d ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/homogeneous-aggr.c -@@ -0,0 +1,25 @@ -+/* { dg-do compile } */ -+/* { dg-additional-options "-O " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+typedef struct sf { float a; float b; float c;} SF; -+ -+__attribute__((__noinline__)) void -+hmg_f (SF a); -+ -+/* we should use registers for each item -+**call_hmg_f: -+** ... -+** fmov s0, 1.0e\+0 -+** fmov s1, 2.0e\+0 -+** fmov s2, 3.0e\+0 -+** bl _hmg_f -+** ... -+*/ -+ -+void -+call_hmg_f (void) -+{ -+ SF A = { 1.0F, 2.0F, 3.0F }; -+ hmg_f (A); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/k+r-00.c b/gcc/testsuite/gcc.target/aarch64/darwin/k+r-00.c -new file mode 100644 -index 00000000000..443fb968811 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/k+r-00.c -@@ -0,0 +1,28 @@ -+/* { dg-do compile } */ -+ -+/* { dg-options "-std=gnu99 " } */ -+/* { dg-additional-options "-O2 -fsection-anchors" } */ -+ -+ -+/* What we care about here is that we get int loads from sp, sp+4 and sp+8. -+ * This code will change when we implement darwinpcs d.3 - since the -+ * promotions will no longer be needed (although they are harmless). -+**test_k_r00: -+** ldrsb w[0-9]+, \[sp, 4\] -+** ldr x[0-9]+, \[sp, 8\] -+** ... -+** ldrsb w[0-9]+, \[sp\] -+** ... -+*/ -+ -+const char * -+test_k_r00 (r0, r1, r2, r3, r4, r5, r6, r7, a, b, c) -+ char r0, r1, r2, r3, r4, r5, r6, r7; -+ char a; -+ char b; -+ const char *c; -+{ -+ if (a > 10 && b < 100) -+ return c; -+ return (char *)0; -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/tu-accesses-0.c b/gcc/testsuite/gcc.target/aarch64/darwin/tu-accesses-0.c -new file mode 100644 -index 00000000000..ba5cc493bc9 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/tu-accesses-0.c -@@ -0,0 +1,82 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O -fcommon -mno-pc-relative-literal-loads" } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+/* This checks that we perform the correct accesses for file-scope vars -+ including GOT indirections. */ -+ -+double gd = 1.0; -+ -+__attribute__((__weak__)) -+double wd = 2.0; -+ -+__attribute__((__visibility__("hidden"))) -+double hd = 3.0; -+ -+__attribute__((__weak__, __visibility__("hidden"))) -+double whd = 4.0; -+ -+extern double ed; -+ -+double cd; -+ -+static double sd = 5.0; -+ -+struct { -+ double a; -+ double b; -+} two_dbls = { 1.0, 42.0 }; -+ -+double arr[3] = { 6.0, 7.0, 8.0 }; -+ -+/* -+**test: -+** adrp x[0-9]+, _gd@PAGE -+** ldr d[0-9]+, \[x[0-9]+, #_gd@PAGEOFF\] -+** adrp x[0-9]+, lC0@PAGE -+** ldr d[0-9]+, \[x[0-9]+, #lC0@PAGEOFF\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _wd@GOTPAGE -+** ldr x[0-9]+, \[x[0-9]+, _wd@GOTPAGEOFF\] -+** ldr d[0-9]+, \[x[0-9]+\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _hd@PAGE -+** ldr d[0-9]+, \[x[0-9]+, #_hd@PAGEOFF\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _whd@PAGE -+** ldr d[0-9]+, \[x[0-9]+, #_whd@PAGEOFF\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _ed@GOTPAGE -+** ldr x[0-9]+, \[x[0-9]+, _ed@GOTPAGEOFF\] -+** ldr d[0-9]+, \[x[0-9]+\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _cd@GOTPAGE -+** ldr x[0-9]+, \[x[0-9]+, _cd@GOTPAGEOFF\] -+** ldr d[0-9]+, \[x[0-9]+\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** fmov d[0-9]+, 5.0e\+0 -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _two_dbls@PAGE\+8 -+** ldr d[0-9]+, \[x[0-9]+, #_two_dbls@PAGEOFF\+8\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** adrp x[0-9]+, _arr@PAGE\+16 -+** ldr d[0-9]+, \[x[0-9]+, #_arr@PAGEOFF\+16\] -+** fadd d[0-9]+, d[0-9]+, d[0-9]+ -+** ret -+*/ -+ -+double test (void) -+{ -+ double x = 123456123456123456.0; -+ x += gd; -+ x += wd; -+ x += hd; -+ x += whd; -+ x += ed; -+ x += cd; -+ x += sd; -+ x += two_dbls.b; -+ x += arr[2]; -+ -+ return x; -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/variadic-00.c b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-00.c -new file mode 100644 -index 00000000000..6420fca11d5 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-00.c -@@ -0,0 +1,91 @@ -+/* { dg-do compile } */ -+ -+/* We use the sections anchors to make the code easier to match. */ -+/* { dg-additional-options " -O -fsection-anchors -fno-schedule-insns -fno-schedule-insns2 " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+#include -+ -+/* What we care about here is that the load of w0 is from the incoming [SP] -+**fooi: -+** sub sp, sp, #16 -+** add x[0-9]+, sp, 24 -+** str x[0-9]+, \[sp, 8\] -+** ldr w0, \[sp, 16\] -+** ... -+*/ -+ -+__attribute__((__noinline__)) int -+fooi (int a, ...) -+{ -+ int x; -+ va_list ap; -+ va_start(ap, a); -+ x = va_arg(ap, int); -+ va_end(ap); -+ return x; -+} -+ -+__attribute__((__noinline__)) int -+fooo (char a, ...); -+ -+/* -+**call_foo: -+** ... -+** mov w[0-9]+, 42 -+** str w[0-9]+, \[sp\] -+** mov w0, 1 -+** bl _fooo -+** ... -+*/ -+ -+__attribute__((__noinline__)) int -+call_foo (void) -+{ -+ int y = fooo (1, 42); -+ return y; -+} -+ -+/* What we care about here is that the load of w0 is from the incoming [SP+8] -+**bari: -+** sub sp, sp, #16 -+** add x[0-9]+, sp, 32 -+** str x[0-9]+, \[sp, 8\] -+** ldr w0, \[sp, 24\] -+** ... -+*/ -+ -+__attribute__((__noinline__)) int -+bari (int a, int b, int c, int d, int e, int f, int g, int h, -+ int i, ...) -+{ -+ int x; -+ va_list ap; -+ va_start(ap, i); -+ x = va_arg(ap, int); -+ va_end(ap); -+ return x; -+} -+ -+/* -+**call_bar: -+** ... -+** mov w[0-9]+, 42 -+** str w[0-9]+, \[sp, 8\] -+** mov w[0-9]+, 9 -+** str w[0-9]+, \[sp\] -+** ... -+ bl _baro -+** ... -+*/ -+ -+__attribute__((__noinline__)) int -+baro (int a, int b, int c, int d, int e, int f, int g, int h, -+ int i, ...); -+ -+__attribute__((__noinline__)) int -+call_bar (void) -+{ -+ int y = baro (1, 2, 3, 4, 5, 6, 7, 8, 9, 42); -+ return y; -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/variadic-01.c b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-01.c -new file mode 100644 -index 00000000000..c055aeae580 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-01.c -@@ -0,0 +1,102 @@ -+/* { dg-do compile } */ -+ -+/* we need this for _Float128. */ -+/* { dg-options "-std=gnu99 " } */ -+/* We use the sections anchors to make the code easier to match. */ -+/* { dg-additional-options " -O2 -fsection-anchors " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+#include -+ -+/* What we care about here is that q0 and q1 are loaded from incoming sp and -+ sp+16. -+**foo: -+** ... -+** ldr q1, \[sp, 32\] -+** ldr q0, \[sp, 48\] -+** ... -+** bl ___addtf3 -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+foo (int n, ...) -+{ -+ _Float128 a, b; -+ va_list ap; -+ -+ va_start(ap, n); -+ a = va_arg(ap, _Float128); -+ b = va_arg(ap, _Float128); -+ va_end(ap); -+ return a + b; -+} -+ -+/* -+**call_foo: -+** ... -+** str q[0-9]+, \[sp, 16\] -+** ... -+** mov w0, 2 -+** str q[0-9]+, \[sp\] -+** bl _foo -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+call_foo (void) -+{ -+ return foo (2, (_Float128)1.0, (_Float128)2.0); -+} -+ -+/* What we care about here is that q0 and q1 are loaded from incoming sp and -+ sp+32 (with the int at sp+16). -+**bar: -+** ... -+** ldr w[0-9]+, \[x[0-9]+, 16\] -+** ldr q0, \[x[0-9]+\] -+** ... -+** ldr q1, \[x[0-9]+, 32\] -+** bl ___addtf3 -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+bar (int n, ...) -+{ -+ _Float128 a, b; -+ va_list ap; -+ -+ va_start(ap, n); -+ a = va_arg(ap, _Float128); -+ n = va_arg(ap, int); -+ if (n != 42) -+ __builtin_abort (); -+ b = va_arg(ap, _Float128); -+ va_end(ap); -+ return a + b; -+} -+ -+/* -+**call_bar: -+** ... -+** str q[0-9]+, \[sp, 32\] -+** ... -+** mov w[0-9]+, 42 -+** str w[0-9]+, \[sp, 16\] -+** mov w0, 2 -+** str q[0-9]+, \[sp\] -+** bl _bar -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+_Float128 -+call_bar (void) -+{ -+ return bar (2, (_Float128)1.0, -+ 42, (_Float128)2.0); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/darwin/variadic-02.c b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-02.c -new file mode 100644 -index 00000000000..9d796bfc07f ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/darwin/variadic-02.c -@@ -0,0 +1,104 @@ -+/* { dg-do compile } */ -+ -+/* we need this for __int128. */ -+/* { dg-options "-std=gnu99 " } */ -+/* We use the sections anchors to make the code easier to match. */ -+/* { dg-additional-options " -O2 -fsection-anchors " } */ -+/* { dg-final { check-function-bodies "**" "" "" { target *-*-darwin* } } } */ -+ -+#include -+ -+/* What we care about here is that we load the values from incoming sp and -+ sp + 16. -+**foo: -+** sub sp, sp, #16 -+** ... -+** ldp x[0-9]+, x[0-9]+, \[sp, 16\] -+** ... -+** ldr x[0-9]+, \[sp, 32\] -+** ldr x[0-9]+, \[sp, 40\] -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+__int128 -+foo (int n, ...) -+{ -+ __int128 a, b; -+ va_list ap; -+ -+ va_start(ap, n); -+ a = va_arg(ap, __int128); -+ b = va_arg(ap, __int128); -+ va_end(ap); -+ return a + b; -+} -+ -+/* -+**call_foo: -+** ... -+** stp x[0-9]+, x[0-9]+, \[sp\] -+** mov w0, 2 -+** stp x[0-9]+, x[0-9]+, \[sp, 16\] -+** bl _foo -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+__int128 -+call_foo (void) -+{ -+ return foo (2, (__int128)1, (__int128)2); -+} ++ esac + ++fi + -+/* sp = one int128, sp+16 = int sp + 32 = other int128 -+**bar: -+** ... -+** sub sp, sp, #16 -+** ... -+** ldp x[0-9]+, x[0-9]+, \[sp, 16\] -+** ... -+** ldr x[0-9]+, \[sp, 48\] -+** ldr x[0-9]+, \[sp, 56\] -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+__int128 -+bar (int n, ...) -+{ -+ __int128 a, b; -+ va_list ap; -+ -+ va_start(ap, n); -+ a = va_arg(ap, __int128); -+ n = va_arg(ap, int); -+ b = va_arg(ap, __int128); -+ va_end(ap); -+ return a + b; -+} + -+__attribute__((__noinline__)) -+__int128 -+baro (int n, ...); -+ -+/* -+**call_bar: -+** ... -+** mov w[0-9]+, 42 -+** ... -+** mov w0, 2 -+** stp x[0-9]+, x[0-9]+, \[sp\] -+** str w[0-9]+, \[sp, 16\] -+** stp x[0-9]+, x[0-9]+, \[sp, 32\] -+** bl _baro -+** ... -+*/ -+ -+__attribute__((__noinline__)) -+__int128 -+call_bar (void) -+{ -+ return baro (2, (__int128)1, 42, (__int128)2); -+} -diff --git a/gcc/testsuite/gcc.target/aarch64/dbl_mov_immediate_1.c b/gcc/testsuite/gcc.target/aarch64/dbl_mov_immediate_1.c -index ba6a230457b..cc30dd546f4 100644 ---- a/gcc/testsuite/gcc.target/aarch64/dbl_mov_immediate_1.c -+++ b/gcc/testsuite/gcc.target/aarch64/dbl_mov_immediate_1.c -@@ -41,8 +41,10 @@ double d4(void) - - /* { dg-final { scan-assembler-times "movi\td\[0-9\]+, #?0" 1 } } */ - --/* { dg-final { scan-assembler-times "adrp\tx\[0-9\]+, \.LC\[0-9\]" 2 } } */ --/* { dg-final { scan-assembler-times "ldr\td\[0-9\]+, \\\[x\[0-9\], #:lo12:\.LC\[0-9\]\\\]" 2 } } */ -+/* { dg-final { scan-assembler-times "adrp\tx\[0-9\]+, \.LC\[0-9\]" 2 { target { ! *-*-darwin* } } } } */ -+/* { dg-final { scan-assembler-times "ldr\td\[0-9\]+, \\\[x\[0-9\], #:lo12:\.LC\[0-9\]\\\]" 2 { target { ! *-*-darwin* } } } } */ -+/* { dg-final { scan-assembler-times "adrp\tx\[0-9\]+, lC\[0-9\]@PAGE" 2 { target *-*-darwin* } } } */ -+/* { dg-final { scan-assembler-times "ldr\td\[0-9\]+, \\\[x\[0-9\], #lC\[0-9\]@PAGEOFF\\\]" 2 { target *-*-darwin* } } } */ - - /* { dg-final { scan-assembler-times "fmov\td\[0-9\]+, 1\\\.5e\\\+0" 1 } } */ - -diff --git a/gcc/testsuite/gcc.target/aarch64/dwarf-cfa-reg.c b/gcc/testsuite/gcc.target/aarch64/dwarf-cfa-reg.c -index ae5b3797021..8a691add222 100644 ---- a/gcc/testsuite/gcc.target/aarch64/dwarf-cfa-reg.c -+++ b/gcc/testsuite/gcc.target/aarch64/dwarf-cfa-reg.c -@@ -1,5 +1,6 @@ - /* Verify that CFA register is restored to SP after FP is restored. */ - /* { dg-do compile } */ -+/* { dg-skip-if "no cfi insn support yet" *-*-darwin* } */ - /* { dg-options "-O0 -gdwarf-2" } */ - /* { dg-final { scan-assembler ".cfi_restore 30" } } */ - /* { dg-final { scan-assembler ".cfi_restore 29" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/inline-lrint_1.c b/gcc/testsuite/gcc.target/aarch64/inline-lrint_1.c -index 478875ff874..9a2b2e44893 100644 ---- a/gcc/testsuite/gcc.target/aarch64/inline-lrint_1.c -+++ b/gcc/testsuite/gcc.target/aarch64/inline-lrint_1.c -@@ -15,4 +15,4 @@ TEST (fllf, float , long long, l) - - /* { dg-final { scan-assembler-times "frintx\t\[d,s\]\[0-9\]+, \[d,s\]\[0-9\]+" 6 } } */ - /* { dg-final { scan-assembler-times "fcvtzs\tx\[0-9\]+, \[d,s\]\[0-9\]+" 6 } } */ --/* { dg-final { scan-assembler-not "bl" } } */ -+/* { dg-final { scan-assembler-not "bl\t" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/ldp_stp_13.c b/gcc/testsuite/gcc.target/aarch64/ldp_stp_13.c -index 9cc3942f153..52c90a92114 100644 ---- a/gcc/testsuite/gcc.target/aarch64/ldp_stp_13.c -+++ b/gcc/testsuite/gcc.target/aarch64/ldp_stp_13.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-require-effective-target arm_mabi_ilp32 } */ - /* { dg-options "-O2 -mabi=ilp32" } */ - - long long -diff --git a/gcc/testsuite/gcc.target/aarch64/memset-corner-cases-2.c b/gcc/testsuite/gcc.target/aarch64/memset-corner-cases-2.c -index 9ee96f33255..dec73f98506 100644 ---- a/gcc/testsuite/gcc.target/aarch64/memset-corner-cases-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/memset-corner-cases-2.c -@@ -7,7 +7,7 @@ - /* 127 bytes should use libcall for size. - **set127byte: - ** mov x2, 127 --** b memset -+** b _?memset - */ - void __attribute__((__noinline__)) - set127byte (int64_t *src, int c) -@@ -18,7 +18,7 @@ set127byte (int64_t *src, int c) - /* 128 bytes should use libcall for size. - **set128byte: - ** mov x2, 128 --** b memset -+** b _?memset - */ - void __attribute__((__noinline__)) - set128byte (int64_t *src, int c) -diff --git a/gcc/testsuite/gcc.target/aarch64/memset-corner-cases.c b/gcc/testsuite/gcc.target/aarch64/memset-corner-cases.c -index c43f0199adc..733a11e585a 100644 ---- a/gcc/testsuite/gcc.target/aarch64/memset-corner-cases.c -+++ b/gcc/testsuite/gcc.target/aarch64/memset-corner-cases.c -@@ -77,7 +77,7 @@ set256byte (int64_t *src, char c) - **set257byte: - ** mov x2, 257 - ** mov w1, 99 --** b memset -+** b _?memset - */ - void __attribute__((__noinline__)) - set257byte (int64_t *src) -diff --git a/gcc/testsuite/gcc.target/aarch64/no-inline-lrint_1.c b/gcc/testsuite/gcc.target/aarch64/no-inline-lrint_1.c -index d5e9200562c..7f504ad687f 100644 ---- a/gcc/testsuite/gcc.target/aarch64/no-inline-lrint_1.c -+++ b/gcc/testsuite/gcc.target/aarch64/no-inline-lrint_1.c -@@ -14,6 +14,6 @@ TEST (dlld, double, long long, l) - TEST (fllf, float , long long, l) - - /* { dg-final { scan-assembler-times "frintx\t\[d,s\]\[0-9\]+, \[d,s\]\[0-9\]+" 6 } } */ --/* { dg-final { scan-assembler-times "bl\tlrint" 4 } } */ --/* { dg-final { scan-assembler-times "bl\tllrint" 2 } } */ -+/* { dg-final { scan-assembler-times "bl\t_*lrint" 4 } } */ -+/* { dg-final { scan-assembler-times "bl\t_*llrint" 2 } } */ - /* { dg-final { scan-assembler-not "fcvtzs" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/pr100518.c b/gcc/testsuite/gcc.target/aarch64/pr100518.c -index 5ca599f5d2e..4e7d6bc7d90 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr100518.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr100518.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-require-effective-target arm_mabi_ilp32 } */ - /* { dg-options "-mabi=ilp32 -mstrict-align -O2" } */ - - int unsigned_range_min, unsigned_range_max, a11___trans_tmp_1; -diff --git a/gcc/testsuite/gcc.target/aarch64/pr62308.c b/gcc/testsuite/gcc.target/aarch64/pr62308.c -index 1cf6e212dca..4c1a733e84d 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr62308.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr62308.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-skip-if "Darwin platforms do not support big-endian arm64" *-*-darwin* } */ - /* { dg-options "-mbig-endian" } */ - - typedef int __attribute__((vector_size(16))) v4si; -diff --git a/gcc/testsuite/gcc.target/aarch64/pr78255.c b/gcc/testsuite/gcc.target/aarch64/pr78255.c -index b078cf3e1c1..fc5d859ee68 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr78255.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr78255.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-skip-if "Darwin platforms do not support tiny" *-*-darwin* } */ - /* { dg-options "-O2 -mcmodel=tiny" } */ - - extern int bar (void *); -diff --git a/gcc/testsuite/gcc.target/aarch64/pr78561.c b/gcc/testsuite/gcc.target/aarch64/pr78561.c -index 048d2d7969f..635214edde1 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr78561.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr78561.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-skip-if "Darwin platforms do not support tiny" *-*-darwin* } */ - /* { dg-options "-Og -O3 -mcmodel=tiny" } */ + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes +@@ -9733,9 +9781,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - int -diff --git a/gcc/testsuite/gcc.target/aarch64/pr80295.c b/gcc/testsuite/gcc.target/aarch64/pr80295.c -index b3866d8d6a9..7a7f127b65f 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr80295.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr80295.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-require-effective-target arm_mabi_ilp32 } */ - /* { dg-options "-mabi=ilp32" } */ - - void f (void *b) -diff --git a/gcc/testsuite/gcc.target/aarch64/pr87305.c b/gcc/testsuite/gcc.target/aarch64/pr87305.c -index 8beaa9176e0..c3f98e8eaec 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr87305.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr87305.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-skip-if "Darwin platforms do not support big-endian arm64" *-*-darwin* } */ - /* { dg-options "-Ofast -mbig-endian -w" } */ - - int cc; -diff --git a/gcc/testsuite/gcc.target/aarch64/pr92424-1.c b/gcc/testsuite/gcc.target/aarch64/pr92424-1.c -index c413a2c306e..59f7435dc83 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr92424-1.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr92424-1.c -@@ -1,6 +1,7 @@ - /* { dg-do "compile" } */ - /* { dg-options "-O1" } */ - /* { dg-final { check-function-bodies "**" "" } } */ -+/* { dg-skip-if "unimplemented patchable function entry" *-*-darwin* } */ - - /* Note: this test only checks the instructions in the function bodies, - not the placement of the patch label or nops before the futncion. */ -diff --git a/gcc/testsuite/gcc.target/aarch64/pr94201.c b/gcc/testsuite/gcc.target/aarch64/pr94201.c -index 69176169186..051c742e98e 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr94201.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr94201.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-require-effective-target arm_mabi_ilp32 } */ - /* { dg-options "-mcmodel=tiny -mabi=ilp32 -fPIC" } */ - - extern int bar (void *); -diff --git a/gcc/testsuite/gcc.target/aarch64/pr94577.c b/gcc/testsuite/gcc.target/aarch64/pr94577.c -index 6f2d3612c26..6a52e52dc39 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr94577.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr94577.c -@@ -1,4 +1,5 @@ - /* { dg-do compile } */ -+/* { dg-require-effective-target arm_mabi_ilp32 } */ - /* { dg-options "-mcmodel=large -mabi=ilp32" } */ + else +@@ -11541,7 +11593,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11544 "configure" ++#line 11596 "configure" + #include "confdefs.h" - void -diff --git a/gcc/testsuite/gcc.target/aarch64/pr97535.c b/gcc/testsuite/gcc.target/aarch64/pr97535.c -index 7d4db485f1f..6f1ee8035eb 100644 ---- a/gcc/testsuite/gcc.target/aarch64/pr97535.c -+++ b/gcc/testsuite/gcc.target/aarch64/pr97535.c -@@ -13,4 +13,4 @@ void setRaw(const void *raw) - - /* At any optimization level this should be a function call - and not inlined. */ --/* { dg-final { scan-assembler "bl\tmemcpy" } } */ -+/* { dg-final { scan-assembler "bl\t_*memcpy" } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-2.c b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-2.c -index 8eec6824f37..193c65717ed 100644 ---- a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-2.c -@@ -1,5 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-Ofast" } */ -+/* { dg-skip-if "no system variant_pcs support" *-*-darwin* } */ - - __attribute__ ((__simd__ ("notinbranch"))) - __attribute__ ((__nothrow__ , __leaf__ , __const__)) -@@ -12,5 +13,5 @@ void bar(double * f, int n) - f[i] = foo(f[i]); - } + #if HAVE_DLFCN_H +@@ -11647,7 +11699,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11650 "configure" ++#line 11702 "configure" + #include "confdefs.h" --/* { dg-final { scan-assembler-not {\.variant_pcs\tfoo} } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnN2v_foo} 1 } } */ -+/* { dg-final { scan-assembler-not {\.variant_pcs\t_?foo} } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnN2v_foo} 1 } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-3.c b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-3.c -index 95f6a6803e8..6fd57735b3a 100644 ---- a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-3.c -+++ b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute-3.c -@@ -1,5 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-Ofast" } */ -+/* { dg-skip-if "no system variant_pcs support" *-*-darwin* } */ - - __attribute__ ((__simd__)) - __attribute__ ((__nothrow__ , __leaf__ , __const__)) -@@ -17,8 +18,8 @@ double foo(double x) - return x * x / 3.0; - } + #if HAVE_DLFCN_H +@@ -11886,6 +11938,15 @@ CC="$lt_save_CC" --/* { dg-final { scan-assembler-not {\.variant_pcs\tfoo} } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnM1v_foo} 1 } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnM2v_foo} 1 } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnN1v_foo} 1 } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnN2v_foo} 1 } } */ -+/* { dg-final { scan-assembler-not {\.variant_pcs\t_?foo} } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnM1v_foo} 1 } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnM2v_foo} 1 } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnN1v_foo} 1 } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnN2v_foo} 1 } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute.c b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute.c -index eddcef3597c..62ee482a892 100644 ---- a/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute.c -+++ b/gcc/testsuite/gcc.target/aarch64/simd_pcs_attribute.c -@@ -1,5 +1,6 @@ - /* { dg-do compile } */ - /* { dg-options "-Ofast" } */ -+/* { dg-skip-if "no system variant_pcs support" *-*-darwin* } */ - - __attribute__ ((__simd__ ("notinbranch"))) - __attribute__ ((__nothrow__ , __leaf__ , __const__)) -@@ -12,5 +13,5 @@ void foo(double *f, int n) - f[i] = log(f[i]); - } --/* { dg-final { scan-assembler-not {\.variant_pcs\tlog} } } */ --/* { dg-final { scan-assembler-times {\.variant_pcs\t_ZGVnN2v_log} 1 } } */ -+/* { dg-final { scan-assembler-not {\.variant_pcs\t_?log} } } */ -+/* { dg-final { scan-assembler-times {\.variant_pcs\t_?_ZGVnN2v_log} 1 } } */ -diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-1.c b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-1.c -index 6885894a97e..ebba23c9d02 100644 ---- a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-1.c -+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-1.c -@@ -1,6 +1,7 @@ - /* { dg-do compile } */ - /* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -funwind-tables" } */ - /* { dg-require-effective-target supports_stack_clash_protection } */ -+/* { dg-skip-if "no cfi insn support yet" *-*-darwin* } */ - - #define SIZE 128*1024 - #include "stack-check-prologue.h" -diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-2.c b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-2.c -index 5796a53be06..e15fbd6196c 100644 ---- a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-2.c -+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-2.c -@@ -1,6 +1,7 @@ - /* { dg-do compile } */ - /* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=16 -funwind-tables" } */ - /* { dg-require-effective-target supports_stack_clash_protection } */ -+/* { dg-skip-if "no cfi insn support yet" *-*-darwin* } */ - - #define SIZE 1280*1024 + 512 - #include "stack-check-prologue.h" -diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-3.c b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-3.c -index c4b7bb601c4..ccaf2e6f8cf 100644 ---- a/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-3.c -+++ b/gcc/testsuite/gcc.target/aarch64/stack-check-cfa-3.c -@@ -1,6 +1,7 @@ - /* { dg-do compile } */ - /* { dg-options "-O3 -fopenmp-simd -march=armv8-a+sve -fstack-clash-protection --param stack-clash-protection-guard-size=16 -funwind-tables" } */ - /* { dg-require-effective-target supports_stack_clash_protection } */ -+/* { dg-skip-if "no cfi insn support yet" *-*-darwin* } */ - - #include "stack-check-prologue-16.c" - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/aarch64-sve.exp b/gcc/testsuite/gcc.target/aarch64/sve/aarch64-sve.exp -index 71dd6687c6b..7a62814edbb 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve/aarch64-sve.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve/aarch64-sve.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } then { - return - } -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} ++ if test x$enable_darwin_at_rpath = xyes; then ++ ENABLE_DARWIN_AT_RPATH_TRUE= ++ ENABLE_DARWIN_AT_RPATH_FALSE='#' ++else ++ ENABLE_DARWIN_AT_RPATH_TRUE='#' ++ ENABLE_DARWIN_AT_RPATH_FALSE= ++fi + - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -index a271f1793f4..2da5720d1f3 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp -@@ -24,6 +24,11 @@ if {![istarget aarch64*-*-*] } { - return - } - -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} + - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp -index ce71c9c1fd4..c7bd136f202 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } { - return - } + # Check whether --enable-largefile was given. + if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +@@ -14435,6 +14496,10 @@ if test -z "${HAVE_DWZ_TRUE}" && test -z "${HAVE_DWZ_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DWZ\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then ++ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${HAVE_ELF_TRUE}" && test -z "${HAVE_ELF_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ELF\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac +index 39e6bf41e35..98b96fcb86f 100644 +--- a/libbacktrace/configure.ac ++++ b/libbacktrace/configure.ac +@@ -84,6 +84,8 @@ AM_CONDITIONAL(HAVE_DWZ, test "$DWZ" != "") + LT_INIT + AM_PROG_LIBTOOL -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} ++AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp b/gcc/testsuite/gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp -index 83786733f35..9ab68902def 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp -@@ -25,6 +25,10 @@ if {![istarget aarch64*-*-*] } then { - return - } + AC_SYS_LARGEFILE -+if { [istarget *-*-darwin*] } then { -+ return -+} -+ - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/aarch64-sve2.exp b/gcc/testsuite/gcc.target/aarch64/sve2/aarch64-sve2.exp -index 60652dbf8fb..010e32132cb 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve2/aarch64-sve2.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve2/aarch64-sve2.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } then { - return - } + backtrace_supported=yes +diff --git a/libcc1/configure b/libcc1/configure +index bae3b8712b6..9ee2b785eb1 100755 +--- a/libcc1/configure ++++ b/libcc1/configure +@@ -787,6 +787,7 @@ with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock ++enable_darwin_at_rpath + enable_cet + with_gcc_major_version_only + enable_werror_always +@@ -1439,6 +1440,8 @@ Optional Features: + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-darwin-at-path install libraries with @rpath/library-name, requires ++ rpaths to be added to executables + --enable-cet enable Intel CET in host libraries [default=auto] + --enable-werror-always enable -Werror despite compiler version + --enable-plugin enable plugin support +@@ -7271,7 +7274,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -8976,6 +8979,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} -+ - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -index e08cd612190..a7e5f364770 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp -@@ -24,6 +24,11 @@ if {![istarget aarch64*-*-*] } { - return - } -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} + - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp -index f0255967c9d..82092e337f6 100644 ---- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp -+++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp -@@ -25,6 +25,11 @@ if {![istarget aarch64*-*-*] } { - return - } - -+# Darwin doesn't support sve -+if { [istarget *-*-darwin*] } then { -+ return -+} ++ # Publish an arg to allow the user to select that Darwin host (and target) ++ # libraries should be given install-names like @rpath/libfoo.dylib. This ++ # requires that the user of the library then adds an 'rpath' to the DSO that ++ # needs access. ++ # NOTE: there are defaults below, for systems that support rpaths. The person ++ # configuring can override the defaults for any system version that supports ++ # them - they are, however, forced off for system versions without support. ++ # Check whether --enable-darwin-at-rpath was given. ++if test "${enable_darwin_at_rpath+set}" = set; then : ++ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then ++ # This is not supported before macOS 10.5 / Darwin9. ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} ++ enable_darwin_at_rpath=no ++ ;; ++ esac ++ fi ++else ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ # As above, before 10.5 / Darwin9 this does not work. ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ enable_darwin_at_rpath=no ++ ;; + - # Load support procs. - load_lib gcc-dg.exp - -diff --git a/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c b/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c -index fc6a4f3ec78..2d9e94bc625 100644 ---- a/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c -+++ b/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c -@@ -1,4 +1,5 @@ - /* { dg-do link } */ -+/* { dg-skip-if "no mcmodel tiny" *-*-darwin* } */ - /* { dg-options "-O3 -save-temps -mcmodel=tiny" } */ - - char fixed_regs[0x00080000]; -diff --git a/gcc/testsuite/gcc.target/aarch64/uaddw-3.c b/gcc/testsuite/gcc.target/aarch64/uaddw-3.c -index 39cbd6b6cc2..b4ed187bd2c 100644 ---- a/gcc/testsuite/gcc.target/aarch64/uaddw-3.c -+++ b/gcc/testsuite/gcc.target/aarch64/uaddw-3.c -@@ -1,10 +1,11 @@ - /* { dg-do compile } */ - /* { dg-options "-O3" } */ -+/* { dg-additional-options "-fno-signed-char" { target *-*-darwin* } } */ - - #pragma GCC target "+nosve" - - int --t6(int len, void * dummy, char * __restrict x) -+t6(int len, void * dummy, unsigned char * __restrict x) - { - len = len & ~31; - unsigned short result = 0; -diff --git a/gcc/testsuite/gcc.target/aarch64/vect-cse-codegen.c b/gcc/testsuite/gcc.target/aarch64/vect-cse-codegen.c -index d025e989a1e..f218504c719 100644 ---- a/gcc/testsuite/gcc.target/aarch64/vect-cse-codegen.c -+++ b/gcc/testsuite/gcc.target/aarch64/vect-cse-codegen.c -@@ -6,8 +6,8 @@ - - /* - **test1: --** adrp x[0-9]+, .LC[0-9]+ --** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] -+** adrp x[0-9]+, (.LC[0-9]+|lC[0-9]+@PAGE) -+** ldr q[0-9]+, \[x[0-9]+, #(:lo12:.LC[0-9]+|lC[0-9]+@PAGEOFF)\] - ** add v[0-9]+.2d, v[0-9]+.2d, v[0-9]+.2d - ** str q[0-9]+, \[x[0-9]+\] - ** fmov x[0-9]+, d[0-9]+ -@@ -27,13 +27,14 @@ test1 (uint64_t a, uint64x2_t b, uint64x2_t* rt) - - /* - **test2: --** adrp x[0-9]+, .LC[0-1]+ --** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] -+** adrp x[0-9]+, (.LC[0-1]+|lC[0-1]+@PAGE) -+** ldr q[0-9]+, \[x[0-9]+, #(:lo12:.LC[0-9]+|lC[0-9]+@PAGEOFF)\] - ** add v[0-9]+.2d, v[0-9]+.2d, v[0-9]+.2d - ** str q[0-9]+, \[x[0-9]+\] - ** fmov x[0-9]+, d[0-9]+ - ** orr x[0-9]+, x[0-9]+, x[0-9]+ - ** ret -+ - */ - - uint64_t -@@ -48,8 +49,8 @@ test2 (uint64_t a, uint64x2_t b, uint64x2_t* rt) - - /* - **test3: --** adrp x[0-9]+, .LC[0-9]+ --** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] -+** adrp x[0-9]+, (.LC[0-9]+|lC[0-9]+@PAGE) -+** ldr q[0-9]+, \[x[0-9]+, #(:lo12:.LC[0-9]+|lC[0-9]+@PAGEOFF)\] - ** add v[0-9]+.4s, v[0-9]+.4s, v[0-9]+.4s - ** str q[0-9]+, \[x1\] - ** fmov w[0-9]+, s[0-9]+ -diff --git a/gcc/testsuite/gfortran.dg/coarray/caf.exp b/gcc/testsuite/gfortran.dg/coarray/caf.exp -index 8683a2ab435..e76cb69dcd9 100644 ---- a/gcc/testsuite/gfortran.dg/coarray/caf.exp -+++ b/gcc/testsuite/gfortran.dg/coarray/caf.exp -@@ -28,6 +28,7 @@ ++ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use ++ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key ++ # system executables (e.g. /bin/sh). Force rpaths on for these systems. ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} ++ enable_darwin_at_rpath=yes ++ ;; ++ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can ++ # work with either DYLD_LIBRARY_PATH or embedded rpaths. ++ ++ esac ++ ++fi ++ ++ + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes +@@ -8993,9 +9039,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - # Load procedures from common libraries. - load_lib gfortran-dg.exp -+load_lib atomic-dg.exp + else +@@ -10801,7 +10851,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10804 "configure" ++#line 10854 "configure" + #include "confdefs.h" - # If a testcase doesn't have special options, use these. - global DEFAULT_FFLAGS -@@ -47,6 +48,7 @@ global gfortran_test_path - global gfortran_aux_module_flags - set gfortran_test_path $srcdir/$subdir - set gfortran_aux_module_flags $DEFAULT_FFLAGS -+ - proc dg-compile-aux-modules { args } { - global gfortran_test_path - global gfortran_aux_module_flags -@@ -69,9 +71,21 @@ proc dg-compile-aux-modules { args } { - } - - # Add -latomic only where supported. Assume built-in support elsewhere. --set maybe_atomic_lib "" - if [check_effective_target_libatomic_available] { -- set maybe_atomic_lib "-latomic" -+ #set maybe_atomic_lib "-latomic" -+ if ![is_remote host] { -+ if [info exists TOOL_OPTIONS] { -+ set maybe_atomic_lib "[atomic_link_flags [get_multilibs ${TOOL_OPTIONS}]]" -+ } else { -+ set maybe_atomic_lib "[atomic_link_flags [get_multilibs]]" -+ } -+ } else { -+ set maybe_atomic_lib "" -+ } -+ set t [get_multilibs] -+ puts "maybe al $maybe_atomic_lib ml $t" -+} else { -+ set maybe_atomic_lib "" - } - - # Main loop. -diff --git a/gcc/testsuite/gfortran.dg/dg.exp b/gcc/testsuite/gfortran.dg/dg.exp -index bd7ad95ad0d..36fc2972b2e 100644 ---- a/gcc/testsuite/gfortran.dg/dg.exp -+++ b/gcc/testsuite/gfortran.dg/dg.exp -@@ -18,6 +18,7 @@ + #if HAVE_DLFCN_H +@@ -10907,7 +10957,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10910 "configure" ++#line 10960 "configure" + #include "confdefs.h" - # Load support procs. - load_lib gfortran-dg.exp -+load_lib atomic-dg.exp + #if HAVE_DLFCN_H +@@ -12189,6 +12239,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) - # If a testcase doesn't have special options, use these. - global DEFAULT_FFLAGS -@@ -53,12 +54,30 @@ proc dg-compile-aux-modules { args } { - } - } -+# coarray tests might need libatomic. Assume that it is either not needed or -+# provided by builtins if it's not available. -+if [check_effective_target_libatomic_available] { -+ if ![is_remote host] { -+ if [info exists TOOL_OPTIONS] { -+ set maybe_atomic_lib "[atomic_link_flags [get_multilibs ${TOOL_OPTIONS}]]" -+ } else { -+ set maybe_atomic_lib "[atomic_link_flags [get_multilibs]]" -+ } -+ } else { -+ set maybe_atomic_lib "" -+ } -+ set t [get_multilibs] -+ puts "dg set al $maybe_atomic_lib ml $t" -+} + -+puts "DEFAULT_FFLAGS $DEFAULT_FFLAGS" ++ # Publish an arg to allow the user to select that Darwin host (and target) ++ # libraries should be given install-names like @rpath/libfoo.dylib. This ++ # requires that the user of the library then adds an 'rpath' to the DSO that ++ # needs access. ++ # NOTE: there are defaults below, for systems that support rpaths. The person ++ # configuring can override the defaults for any system version that supports ++ # them - they are, however, forced off for system versions without support. ++ # Check whether --enable-darwin-at-rpath was given. ++if test "${enable_darwin_at_rpath+set}" = set; then : ++ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then ++ # This is not supported before macOS 10.5 / Darwin9. ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} ++ enable_darwin_at_rpath=no ++ ;; ++ esac ++ fi ++else ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ # As above, before 10.5 / Darwin9 this does not work. ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ enable_darwin_at_rpath=no ++ ;; + - # Main loop. - gfortran-dg-runtest [lsort \ -- [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" $DEFAULT_FFLAGS -+ [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] $maybe_atomic_lib $DEFAULT_FFLAGS - - gfortran-dg-runtest [lsort \ -- [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] "" $DEFAULT_FFLAGS -+ [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $maybe_atomic_lib $DEFAULT_FFLAGS - - - # All done. -diff --git a/gcc/testsuite/gfortran.dg/pr95690.f90 b/gcc/testsuite/gfortran.dg/pr95690.f90 -index 47a5df9e894..1afa9d3c467 100644 ---- a/gcc/testsuite/gfortran.dg/pr95690.f90 -+++ b/gcc/testsuite/gfortran.dg/pr95690.f90 -@@ -2,8 +2,8 @@ - module m - contains - subroutine s -- print *, (erfc) ! { dg-error "not a floating constant" "" { target i?86-*-* x86_64-*-* sparc*-*-* cris-*-* } } -- end ! { dg-error "not a floating constant" "" { target { ! "i?86-*-* x86_64-*-* sparc*-*-* cris-*-*" } } } -+ print *, (erfc) ! { dg-error "not a floating constant" "" { target i?86-*-* x86_64-*-* sparc*-*-* cris-*-* aarch64-apple-darwin* } } -+ end ! { dg-error "not a floating constant" "" { target { ! "i?86-*-* x86_64-*-* sparc*-*-* cris-*-* aarch64-apple-darwin*" } } } - function erfc() - end - end -diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp -index 7e0f85dc9b0..88c6ece8caa 100644 ---- a/gcc/testsuite/lib/asan-dg.exp -+++ b/gcc/testsuite/lib/asan-dg.exp -@@ -78,7 +78,7 @@ proc asan_link_flags_1 { paths lib } { - || [file exists "${gccpath}/libsanitizer/${lib}/.libs/lib${lib}.${shlib_ext}"] } { - append flags " -B${gccpath}/libsanitizer/ " - append flags " -B${gccpath}/libsanitizer/${lib}/ " -- append flags " -L${gccpath}/libsanitizer/${lib}/.libs " -+ append flags " -B${gccpath}/libsanitizer/${lib}/.libs " - append ld_library_path ":${gccpath}/libsanitizer/${lib}/.libs" - } - } else { -diff --git a/gcc/testsuite/lib/atomic-dg.exp b/gcc/testsuite/lib/atomic-dg.exp -index 86dcfa674ea..c9244fb6cac 100644 ---- a/gcc/testsuite/lib/atomic-dg.exp -+++ b/gcc/testsuite/lib/atomic-dg.exp -@@ -33,7 +33,7 @@ proc atomic_link_flags { paths } { - if { [file exists "${gccpath}/libatomic/.libs/libatomic.a"] - || [file exists "${gccpath}/libatomic/.libs/libatomic.${shlib_ext}"] } { - append flags " -B${gccpath}/libatomic/ " -- append flags " -L${gccpath}/libatomic/.libs" -+ append flags " -B${gccpath}/libatomic/.libs" - append ld_library_path ":${gccpath}/libatomic/.libs" - } - } else { -diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp -index a80630bb2a8..195611f1f72 100644 ---- a/gcc/testsuite/lib/scanasm.exp -+++ b/gcc/testsuite/lib/scanasm.exp -@@ -763,7 +763,7 @@ proc scan-lto-assembler { args } { - # to function bodies in array RESULT. FILENAME has already been uploaded - # locally where necessary and is known to exist. - --proc parse_function_bodies { filename result } { -+proc parse_ELF_function_bodies { filename result } { - upvar $result up_result - - # Regexp for the start of a function definition (name in \1). -@@ -793,6 +793,44 @@ proc parse_function_bodies { filename result } { - close $fd - } - -+proc parse_MACHO_function_bodies { filename result } { -+ upvar $result up_result -+ -+ # Regexp for the start of a function definition (name in \1). -+ set label {^(_[a-zA-Z_]\S+):$} -+ set start {^LFB[0-9]+} -+ -+ # Regexp for the end of a function definition. -+ set terminator {^LFE[0-9]+} -+ -+ # Regexp for lines that aren't interesting. -+ set fluff {^\s*(?:\.|//|@)} -+ set fluff3 {^L[0-9ACESV]} -+ -+ set fd [open $filename r] -+ set in_function 0 -+ while { [gets $fd line] >= 0 } { -+ if { !$in_function && [regexp $label $line dummy function_name] } { -+ set in_function 1 -+ set function_body "" -+ } elseif { $in_function == 1 } { -+ if { [regexp $start $line] } { -+ set in_function 2 -+ } else { -+ set in_function 0 -+ } -+ } elseif { $in_function == 2 } { -+ if { [regexp $terminator $line] } { -+ set up_result($function_name) $function_body -+ set in_function 0 -+ } elseif { ![regexp $fluff $line] && ![regexp $fluff3 $line] } { -+ append function_body $line "\n" -+ } -+ } -+ } -+ close $fd -+} ++ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use ++ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key ++ # system executables (e.g. /bin/sh). Force rpaths on for these systems. ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} ++ enable_darwin_at_rpath=yes ++ ;; ++ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can ++ # work with either DYLD_LIBRARY_PATH or embedded rpaths. + - # FUNCTIONS is an array that maps function names to function bodies. - # Return true if it contains a definition of function NAME and if - # that definition matches BODY_REGEXP. -@@ -820,6 +858,14 @@ proc check-function-bodies { args } { - error "too many arguments to check-function-bodies" - } - -+ set isELF 1 -+ # some targets have a __USER_LABEL_PREFIX__ -+ set needsULP 0 -+ if { [istarget *-*-darwin*] } { -+ set isELF 0 -+ set needsULP 1 -+ } ++ esac + - if { [llength $args] >= 3 } { - set required_flags [lindex $args 2] - -@@ -876,7 +922,11 @@ proc check-function-bodies { args } { - remote_upload host "$filename" - } - if { [file exists $output_filename] } { -- parse_function_bodies $output_filename functions -+ if { $isELF } { -+ parse_ELF_function_bodies $output_filename functions -+ } else { -+ parse_MACHO_function_bodies $output_filename functions -+ } - set have_bodies 1 - } else { - verbose -log "$testcase: output file does not exist" -@@ -921,6 +971,9 @@ proc check-function-bodies { args } { - if { $xfail_all || [string equal $selector "F"] } { - setup_xfail "*-*-*" - } -+ if { $needsULP } { -+ set function_name "_$function_name" -+ } - set testname "$testcase check-function-bodies $function_name" - if { !$have_bodies } { - unresolved $testname -diff --git a/gcc/testsuite/lib/target-libpath.exp b/gcc/testsuite/lib/target-libpath.exp -index d09cd515d20..280ce390845 100644 ---- a/gcc/testsuite/lib/target-libpath.exp -+++ b/gcc/testsuite/lib/target-libpath.exp -@@ -67,6 +67,7 @@ proc set_ld_library_path_env_vars { } { - global orig_dyld_library_path - global orig_path - global orig_gcc_exec_prefix -+ global ENABLE_DARWIN_AT_RPATH - global env - - # Save the original GCC_EXEC_PREFIX. -@@ -133,6 +134,7 @@ proc set_ld_library_path_env_vars { } { - # - # Doing this is somewhat of a hack as ld_library_path gets repeated in - # SHLIB_PATH and LD_LIBRARY_PATH when unix_load sets these variables. -+ if { ![istarget *-*-darwin*] } { - if { $orig_ld_library_path_saved } { - setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path" - } else { -@@ -166,11 +168,23 @@ proc set_ld_library_path_env_vars { } { - } else { - setenv LD_LIBRARY_PATH_64 "$ld_library_path" - } -- if { $orig_dyld_library_path_saved } { -- setenv DYLD_LIBRARY_PATH "$ld_library_path:$orig_dyld_library_path" -- } else { -- setenv DYLD_LIBRARY_PATH "$ld_library_path" - } -+ if { [istarget *-*-darwin*] } { -+ if { [info exists ENABLE_DARWIN_AT_RPATH] || [istarget *-*-darwin1\[5-9\]*] -+ || [istarget *-*-darwin2*] } { -+ # Either we are not using DYLD_LIBRARY_PATH or we're on a version of the -+ # OS for which it is not passed through system exes. -+ if [info exists env(DYLD_LIBRARY_PATH)] { -+ unsetenv DYLD_LIBRARY_PATH -+ } -+ } else { -+ if { $orig_dyld_library_path_saved } { -+ setenv DYLD_LIBRARY_PATH "$ld_library_path:$orig_dyld_library_path" -+ } else { -+ setenv DYLD_LIBRARY_PATH "$ld_library_path" -+ } -+ } -+ } - if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } { - if { $orig_path_saved } { - setenv PATH "$ld_library_path:$orig_path" -@@ -179,6 +193,7 @@ proc set_ld_library_path_env_vars { } { - } - } - -+ verbose -log "set paths" - verbose -log "LD_LIBRARY_PATH=[getenv LD_LIBRARY_PATH]" - verbose -log "LD_RUN_PATH=[getenv LD_RUN_PATH]" - verbose -log "SHLIB_PATH=[getenv SHLIB_PATH]" -diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp -index 244fe2306f4..75581914d6c 100644 ---- a/gcc/testsuite/lib/target-supports.exp -+++ b/gcc/testsuite/lib/target-supports.exp -@@ -8485,7 +8485,7 @@ proc check_effective_target_section_anchors { } { - return [check_cached_effective_target section_anchors { - expr { [istarget powerpc*-*-*] - || [istarget arm*-*-*] -- || [istarget aarch64*-*-*] }}] -+ || ([istarget aarch64*-*-*] && ![istarget aarch64*-*-darwin*]) }}] - } ++fi ++ ++ + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes +@@ -12206,12 +12299,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi - # Return 1 if the target supports atomic operations on "int_128" values. -@@ -11526,6 +11526,15 @@ proc check_effective_target_arm_thumb2_ok_no_arm_v8_1_lob { } { - return 0 - } +diff --git a/libcody/Makefile.in b/libcody/Makefile.in +index bb87468cb9a..cb01b0092d8 100644 +--- a/libcody/Makefile.in ++++ b/libcody/Makefile.in +@@ -31,7 +31,7 @@ endif + CXXOPTS += $(filter-out -DHAVE_CONFIG_H,@DEFS@) -include config.h + + # Linker options +-LDFLAGS := @LDFLAGS@ ++LDFLAGS := @LDFLAGS@ @LD_PICFLAG@ + LIBS := @LIBS@ + + # Per-source & per-directory compile flags (warning: recursive) +diff --git a/libcody/configure b/libcody/configure +index da52a5cfca5..0e536c0ccb0 100755 +--- a/libcody/configure ++++ b/libcody/configure +@@ -591,7 +591,10 @@ configure_args + AR + RANLIB + EXCEPTIONS ++LD_PICFLAG + PICFLAG ++enable_host_pie ++enable_host_shared + OBJEXT + EXEEXT + ac_ct_CXX +@@ -653,6 +656,7 @@ enable_maintainer_mode + with_compiler + enable_checking + enable_host_shared ++enable_host_pie + enable_exceptions + ' + ac_precious_vars='build_alias +@@ -1286,6 +1290,7 @@ Optional Features: + yes,no,all,none,release. Flags are: misc,valgrind or + other strings + --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE + --enable-exceptions enable exceptions & rtti -+# Return 1 if this is an ARM target where -mabi=ilp32 can be used. + Optional Packages: +@@ -2635,11 +2640,34 @@ fi + # Enable --enable-host-shared. + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC ++ enableval=$enable_host_shared; ++fi + -+proc check_effective_target_arm_mabi_ilp32 { } { -+ return [check_no_compiler_messages_nocache arm_mabi_ilp32 assembly { -+ int main() { return 0; } -+ } "-mabi=ilp32"] -+} + + - # Returns 1 if the target is using glibc, 0 otherwise. - - proc check_effective_target_glibc { } { -diff --git a/gcc/testsuite/obj-c++.dg/gnu-api-2-class-meta.mm b/gcc/testsuite/obj-c++.dg/gnu-api-2-class-meta.mm -index 92852c3ecea..e0974539ecf 100644 ---- a/gcc/testsuite/obj-c++.dg/gnu-api-2-class-meta.mm -+++ b/gcc/testsuite/obj-c++.dg/gnu-api-2-class-meta.mm -@@ -19,6 +19,7 @@ this behavior may be defined or documented (for example, if class - - /* { dg-do run } */ - /* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */ -+/* { dg-skip-if "API unsupported" { arm64*-*-darwin* aarch64*-*-darwin* } { "-fnext-runtime" } { "" } } */ - /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ - /* { dg-additional-options "-DOBJC_OLD_DISPATCH_PROTOTYPES" { target { *-*-darwin* } } } */ - // { dg-additional-options "-Wno-objc-root-class" } -diff --git a/gcc/testsuite/obj-c++.dg/gnu-api-2-class.mm b/gcc/testsuite/obj-c++.dg/gnu-api-2-class.mm -index f6e3d8d22e0..a23968a89b5 100644 ---- a/gcc/testsuite/obj-c++.dg/gnu-api-2-class.mm -+++ b/gcc/testsuite/obj-c++.dg/gnu-api-2-class.mm -@@ -6,6 +6,7 @@ - - /* { dg-do run } */ - /* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */ -+/* { dg-skip-if "API unsupported" { arm64*-*-darwin* aarch64*-*-darwin* } { "-fnext-runtime" } { "" } } */ - /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ - /* { dg-additional-options "-DOBJC_OLD_DISPATCH_PROTOTYPES" { target { *-*-darwin* } } } */ - // { dg-additional-options "-Wno-objc-root-class" } -diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm -index 1155db5f83f..e0dd8062373 100644 ---- a/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm -+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-cfstring-4.mm -@@ -18,4 +18,4 @@ - - /* { dg-final { scan-assembler ".section __DATA, __cfstring" } } */ - /* { dg-final { scan-assembler ".long\t___CFConstantStringClassReference\n\t.long\t1992\n\t.long\t.*\n\t.long\t19\n" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t19\n" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t19\n} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm -index e1dad124cd6..eb89710d890 100644 ---- a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm -+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-10.mm -@@ -33,4 +33,4 @@ @interface NSConstantString : NSSimpleCString - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._NSConstantString\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm -index 30a9228a64e..c1b58dc6cb8 100644 ---- a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm -+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-11.mm -@@ -33,4 +33,4 @@ @interface XStr : XString { - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__XStrClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._XStr\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._XStr\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm -index a1a14295e90..8457f46be53 100644 ---- a/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm -+++ b/gcc/testsuite/obj-c++.dg/torture/strings/const-str-9.mm -@@ -25,4 +25,4 @@ @interface NSConstantString: NSObject { - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._NSConstantString\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/objc.dg/gnu-api-2-class-meta.m b/gcc/testsuite/objc.dg/gnu-api-2-class-meta.m -index 6c1c76a87a3..41a48f9c685 100644 ---- a/gcc/testsuite/objc.dg/gnu-api-2-class-meta.m -+++ b/gcc/testsuite/objc.dg/gnu-api-2-class-meta.m -@@ -19,6 +19,7 @@ this behavior may be defined or documented (for example, if class - - /* { dg-do run } */ - /* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */ -+/* { dg-skip-if "API unsupported" { arm64*-*-darwin* aarch64*-*-darwin* } { "-fnext-runtime" } { "" } } */ - /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ - /* { dg-additional-options "-Wno-objc-root-class" } */ - /* { dg-additional-options "-DOBJC_OLD_DISPATCH_PROTOTYPES" { target { *-*-darwin* } } } */ -diff --git a/gcc/testsuite/objc.dg/gnu-api-2-class.m b/gcc/testsuite/objc.dg/gnu-api-2-class.m -index d11dae0e6dc..1386ebc2f99 100644 ---- a/gcc/testsuite/objc.dg/gnu-api-2-class.m -+++ b/gcc/testsuite/objc.dg/gnu-api-2-class.m -@@ -6,6 +6,7 @@ - - /* { dg-do run } */ - /* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */ -+/* { dg-skip-if "API unsupported" { arm64*-*-darwin* aarch64*-*-darwin* } { "-fnext-runtime" } { "" } } */ - /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ - /* { dg-additional-options "-Wno-objc-root-class" } */ - /* { dg-additional-options "-DOBJC_OLD_DISPATCH_PROTOTYPES" { target { *-*-darwin* } } } */ -diff --git a/gcc/testsuite/objc.dg/torture/strings/const-cfstring-4.m b/gcc/testsuite/objc.dg/torture/strings/const-cfstring-4.m -index 1155db5f83f..e0dd8062373 100644 ---- a/gcc/testsuite/objc.dg/torture/strings/const-cfstring-4.m -+++ b/gcc/testsuite/objc.dg/torture/strings/const-cfstring-4.m -@@ -18,4 +18,4 @@ - - /* { dg-final { scan-assembler ".section __DATA, __cfstring" } } */ - /* { dg-final { scan-assembler ".long\t___CFConstantStringClassReference\n\t.long\t1992\n\t.long\t.*\n\t.long\t19\n" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t___CFConstantStringClassReference\n\t.long\t1992\n\t.space 4\n\t.quad\t.*\n\t.quad\t19\n" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t___CFConstantStringClassReference\n\t.(long|word)\t1992\n\t.space 4\n\t.(quad|xword)\t.*\n\t.(quad|xword)\t19\n} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/objc.dg/torture/strings/const-str-10.m b/gcc/testsuite/objc.dg/torture/strings/const-str-10.m -index 6565dc20007..81b0d326c56 100644 ---- a/gcc/testsuite/objc.dg/torture/strings/const-str-10.m -+++ b/gcc/testsuite/objc.dg/torture/strings/const-str-10.m -@@ -34,4 +34,4 @@ @interface NSConstantString : NSSimpleCString - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._NSConstantString\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/objc.dg/torture/strings/const-str-11.m b/gcc/testsuite/objc.dg/torture/strings/const-str-11.m -index 2bdb1531e1d..b044b0fd8c7 100644 ---- a/gcc/testsuite/objc.dg/torture/strings/const-str-11.m -+++ b/gcc/testsuite/objc.dg/torture/strings/const-str-11.m -@@ -33,4 +33,4 @@ @interface XStr : XString { - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__XStrClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._XStr\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._XStr\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/testsuite/objc.dg/torture/strings/const-str-9.m b/gcc/testsuite/objc.dg/torture/strings/const-str-9.m -index 966ea5e498d..d3d2916ed06 100644 ---- a/gcc/testsuite/objc.dg/torture/strings/const-str-9.m -+++ b/gcc/testsuite/objc.dg/torture/strings/const-str-9.m -@@ -25,4 +25,4 @@ @interface NSConstantString: NSObject { - /* { dg-final { scan-assembler ".section __OBJC, __cstring_object" { target { *-*-darwin* && { ! lp64 } } } } } */ - /* { dg-final { scan-assembler ".section __DATA, __objc_stringobj" { target { *-*-darwin* && { lp64 } } } } } */ - /* { dg-final { scan-assembler ".long\t__NSConstantStringClassReference\n\t.long\t.*\n\t.long\t5\n\t.data" { target { *-*-darwin* && { ! lp64 } } } } } */ --/* { dg-final { scan-assembler ".quad\t_OBJC_CLASS_._NSConstantString\n\t.quad\t.*\n\t.long\t5\n\t.space" { target { *-*-darwin* && { lp64 } } } } } */ -+/* { dg-final { scan-assembler {.(quad|xword)\t_OBJC_CLASS_._NSConstantString\n\t.(quad|xword)\t.*\n\t.(long|word)\t5\n\t.space} { target { *-*-darwin* && { lp64 } } } } } */ -diff --git a/gcc/tree-nested.cc b/gcc/tree-nested.cc -index 078ceab3ca3..0308f558036 100644 ---- a/gcc/tree-nested.cc -+++ b/gcc/tree-nested.cc -@@ -611,6 +611,14 @@ get_trampoline_type (struct nesting_info *info) - if (trampoline_type) - return trampoline_type; ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; ++fi ++ ++ ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE + else + PICFLAG= + fi -+ /* When trampolines are created off-stack then the only thing we need in the -+ local frame is a single pointer. */ -+ if (flag_off_stack_trampolines) -+ { -+ trampoline_type = build_pointer_type (void_type_node); -+ return trampoline_type; -+ } ++if test x$enable_host_pie = xyes; then ++ LD_PICFLAG=-pie ++else ++ LD_PICFLAG= ++fi ++ + - align = TRAMPOLINE_ALIGNMENT; - size = TRAMPOLINE_SIZE; -@@ -2786,17 +2794,27 @@ convert_tramp_reference_op (tree *tp, int *walk_subtrees, void *data) - /* Compute the address of the field holding the trampoline. */ - x = get_frame_field (info, target_context, x, &wi->gsi); -- x = build_addr (x); -- x = gsi_gimplify_val (info, x, &wi->gsi); + # Check whether --enable-exceptions was given. +diff --git a/libcody/configure.ac b/libcody/configure.ac +index 960191ecb72..14e8dd4a226 100644 +--- a/libcody/configure.ac ++++ b/libcody/configure.ac +@@ -63,9 +63,31 @@ fi + # Enable --enable-host-shared. + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) ++ [build host code as shared libraries])]) ++AC_SUBST(enable_host_shared) ++ ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi ++ ++if test x$enable_host_pie = xyes; then ++ LD_PICFLAG=-pie ++else ++ LD_PICFLAG= ++fi ++ + AC_SUBST(PICFLAG) ++AC_SUBST(LD_PICFLAG) -- /* Do machine-specific ugliness. Normally this will involve -- computing extra alignment, but it can really be anything. */ -- if (descr) -- builtin = builtin_decl_implicit (BUILT_IN_ADJUST_DESCRIPTOR); -+ /* APB: We don't need to do the adjustment calls when using off-stack -+ trampolines, any such adjustment will be done when the off-stack -+ trampoline is created. */ -+ if (!descr && flag_off_stack_trampolines) -+ x = gsi_gimplify_val (info, x, &wi->gsi); - else -- builtin = builtin_decl_implicit (BUILT_IN_ADJUST_TRAMPOLINE); -- call = gimple_build_call (builtin, 1, x); -- x = init_tmp_var_with_call (info, &wi->gsi, call); -+ { -+ x = build_addr (x); + NMS_ENABLE_EXCEPTIONS + +diff --git a/libcpp/configure b/libcpp/configure +index e9937cde330..1389ddab544 100755 +--- a/libcpp/configure ++++ b/libcpp/configure +@@ -625,6 +625,8 @@ ac_includes_default="\ + ac_subst_vars='LTLIBOBJS + CET_HOST_FLAGS + PICFLAG ++enable_host_pie ++enable_host_shared + MAINT + USED_CATALOGS + PACKAGE +@@ -738,6 +740,7 @@ enable_maintainer_mode + enable_checking + enable_canonical_system_headers + enable_host_shared ++enable_host_pie + enable_cet + enable_valgrind_annotations + ' +@@ -1379,6 +1382,7 @@ Optional Features: + --enable-canonical-system-headers + enable or disable system headers canonicalization + --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE + --enable-cet enable Intel CET in host libraries [default=auto] + --enable-valgrind-annotations + enable valgrind runtime interaction +@@ -7605,7 +7609,23 @@ esac + # Enable --enable-host-shared. + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC ++ enableval=$enable_host_shared; ++fi + -+ x = gsi_gimplify_val (info, x, &wi->gsi); + -+ /* Do machine-specific ugliness. Normally this will involve -+ computing extra alignment, but it can really be anything. */ -+ if (descr) -+ builtin = builtin_decl_implicit (BUILT_IN_ADJUST_DESCRIPTOR); -+ else -+ builtin = builtin_decl_implicit (BUILT_IN_ADJUST_TRAMPOLINE); -+ call = gimple_build_call (builtin, 1, x); -+ x = init_tmp_var_with_call (info, &wi->gsi, call); -+ } - - /* Cast back to the proper function type. */ - x = build1 (NOP_EXPR, TREE_TYPE (t), x); -@@ -3375,6 +3393,7 @@ build_init_call_stmt (struct nesting_info *info, tree decl, tree field, - static void - finalize_nesting_tree_1 (struct nesting_info *root) - { -+ gimple_seq cleanup_list = NULL; - gimple_seq stmt_list = NULL; - gimple *stmt; - tree context = root->context; -@@ -3506,9 +3525,48 @@ finalize_nesting_tree_1 (struct nesting_info *root) - if (!field) - continue; - -- x = builtin_decl_implicit (BUILT_IN_INIT_TRAMPOLINE); -- stmt = build_init_call_stmt (root, i->context, field, x); -- gimple_seq_add_stmt (&stmt_list, stmt); -+ if (flag_off_stack_trampolines) -+ { -+ /* We pass a whole bunch of arguments to the builtin function that -+ creates the off-stack trampoline, these are -+ 1. The nested function chain value (that must be passed to the -+ nested function so it can find the function arguments). -+ 2. A pointer to the nested function implementation, -+ 3. The address in the local stack frame where we should write -+ the address of the trampoline. + -+ When this code was originally written I just kind of threw -+ everything at the builtin, figuring I'd work out what was -+ actually needed later, I think, the stack pointer could -+ certainly be dropped, arguments #2 and #4 are based off the -+ stack pointer anyway, so #1 doesn't seem to add much value. */ -+ tree arg1, arg2, arg3; ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; ++fi + -+ gcc_assert (DECL_STATIC_CHAIN (i->context)); -+ arg1 = build_addr (root->frame_decl); -+ arg2 = build_addr (i->context); + -+ x = build3 (COMPONENT_REF, TREE_TYPE (field), -+ root->frame_decl, field, NULL_TREE); -+ arg3 = build_addr (x); + -+ x = builtin_decl_implicit (BUILT_IN_NESTED_PTR_CREATED); -+ stmt = gimple_build_call (x, 3, arg1, arg2, arg3); -+ gimple_seq_add_stmt (&stmt_list, stmt); ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE + else + PICFLAG= + fi +diff --git a/libcpp/configure.ac b/libcpp/configure.ac +index 89ac99b04bd..b29b4d6acf1 100644 +--- a/libcpp/configure.ac ++++ b/libcpp/configure.ac +@@ -211,8 +211,23 @@ esac + # Enable --enable-host-shared. + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) ++ [build host code as shared libraries])]) ++AC_SUBST(enable_host_shared) ++ ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi + -+ /* This call to delete the nested function trampoline is added to -+ the cleanup list, and called when we exit the current scope. */ -+ x = builtin_decl_implicit (BUILT_IN_NESTED_PTR_DELETED); -+ stmt = gimple_build_call (x, 0); -+ gimple_seq_add_stmt (&cleanup_list, stmt); -+ } -+ else -+ { -+ /* Original code to initialise the on stack trampoline. */ -+ x = builtin_decl_implicit (BUILT_IN_INIT_TRAMPOLINE); -+ stmt = build_init_call_stmt (root, i->context, field, x); -+ gimple_seq_add_stmt (&stmt_list, stmt); -+ } - } - } + AC_SUBST(PICFLAG) -@@ -3533,11 +3591,40 @@ finalize_nesting_tree_1 (struct nesting_info *root) - /* If we created initialization statements, insert them. */ - if (stmt_list) - { -- gbind *bind; -- annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); -- bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); -- gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); -- gimple_bind_set_body (bind, stmt_list); -+ if (flag_off_stack_trampolines) -+ { -+ /* Handle the new, off stack trampolines. */ -+ gbind *bind; -+ annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); -+ annotate_all_with_location (cleanup_list, DECL_SOURCE_LOCATION (context)); -+ bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); -+ gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); + # Enable Intel CET on Intel CET enabled host if jit is enabled. +diff --git a/libdecnumber/configure b/libdecnumber/configure +index fb6db05565a..84bc4ffc767 100755 +--- a/libdecnumber/configure ++++ b/libdecnumber/configure +@@ -626,6 +626,8 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + CET_HOST_FLAGS + PICFLAG ++enable_host_pie ++enable_host_shared + ADDITIONAL_OBJS + enable_decimal_float + target_os +@@ -706,6 +708,7 @@ enable_werror_always + enable_maintainer_mode + enable_decimal_float + enable_host_shared ++enable_host_pie + enable_cet + ' + ac_precious_vars='build_alias +@@ -1338,6 +1341,7 @@ Optional Features: + or 'dpd' choses which decimal floating point format + to use + --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE + --enable-cet enable Intel CET in host libraries [default=auto] + + Some influential environment variables: +@@ -5186,7 +5190,23 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + # Enable --enable-host-shared. + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC ++ enableval=$enable_host_shared; ++fi + -+ gimple_seq xxx_list = NULL; + -+ if (cleanup_list != NULL) -+ { -+ /* We Maybe shouldn't be creating this try/finally if -fno-exceptions is -+ in use. If this is the case, then maybe we should, instead, be -+ inserting the cleanup code onto every path out of this function? Not -+ yet figured out how we would do this. */ -+ gtry *t = gimple_build_try (stmt_list, cleanup_list, GIMPLE_TRY_FINALLY); -+ gimple_seq_add_stmt (&xxx_list, t); -+ } -+ else -+ xxx_list = stmt_list; + -+ gimple_bind_set_body (bind, xxx_list); -+ } -+ else -+ { -+ /* The traditional, on stack trampolines. */ -+ gbind *bind; -+ annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context)); -+ bind = gimple_seq_first_stmt_as_a_bind (gimple_body (context)); -+ gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind)); -+ gimple_bind_set_body (bind, stmt_list); -+ } - } - - /* If a chain_decl was created, then it needs to be registered with -diff --git a/gcc/tree.cc b/gcc/tree.cc -index 4cf3785270b..5cba2ab8171 100644 ---- a/gcc/tree.cc -+++ b/gcc/tree.cc -@@ -9766,6 +9766,23 @@ build_common_builtin_nodes (void) - "__builtin_nonlocal_goto", - ECF_NORETURN | ECF_NOTHROW); - -+ tree ptr_ptr_type_node = build_pointer_type (ptr_type_node); ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; ++fi + -+ ftype = build_function_type_list (void_type_node, -+ ptr_type_node, // void *chain -+ ptr_type_node, // void *func -+ ptr_ptr_type_node, // void **dst -+ NULL_TREE); -+ local_define_builtin ("__builtin_nested_func_ptr_created", ftype, -+ BUILT_IN_NESTED_PTR_CREATED, -+ "__builtin_nested_func_ptr_created", ECF_NOTHROW); + -+ ftype = build_function_type_list (void_type_node, -+ NULL_TREE); -+ local_define_builtin ("__builtin_nested_func_ptr_deleted", ftype, -+ BUILT_IN_NESTED_PTR_DELETED, -+ "__builtin_nested_func_ptr_deleted", ECF_NOTHROW); + - ftype = build_function_type_list (void_type_node, - ptr_type_node, ptr_type_node, NULL_TREE); - local_define_builtin ("__builtin_setjmp_setup", ftype, -diff --git a/libada/configure b/libada/configure -index 162d9731f26..9c8b133d817 100755 ---- a/libada/configure -+++ b/libada/configure -@@ -3212,6 +3212,9 @@ case "${host}" in - # sets the default TLS model and affects inlining. - PICFLAG=-fPIC - ;; -+ loongarch*-*-*) -+ PICFLAG=-fpic -+ ;; - mips-sgi-irix6*) - # PIC is the default. - ;; -diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am -index d88515e4a03..3c921f4a86d 100644 ---- a/libatomic/Makefile.am -+++ b/libatomic/Makefile.am -@@ -65,8 +65,13 @@ libatomic_version_script = - libatomic_version_dep = - endif - libatomic_version_info = -version-info $(libtool_VERSION) ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE + else + PICFLAG= + fi +diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac +index aafd06f8a64..30a51ca410b 100644 +--- a/libdecnumber/configure.ac ++++ b/libdecnumber/configure.ac +@@ -100,8 +100,23 @@ AC_C_BIGENDIAN + # Enable --enable-host-shared. + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) ++ [build host code as shared libraries])]) ++AC_SUBST(enable_host_shared) ++ ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi ++ + AC_SUBST(PICFLAG) + + # Enable Intel CET on Intel CET enabled host if jit is enabled. +diff --git a/libffi/Makefile.am b/libffi/Makefile.am +index c6d6f849c53..d2ae0c04c7b 100644 +--- a/libffi/Makefile.am ++++ b/libffi/Makefile.am +@@ -214,7 +214,12 @@ libffi.map: $(top_srcdir)/libffi.map.in + $(COMPILE) -D$(TARGET) -DGENERATE_LIBFFI_MAP \ + -E -x assembler-with-cpp -o $@ $(top_srcdir)/libffi.map.in + +-libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) +if ENABLE_DARWIN_AT_RPATH -+libatomic_darwin_rpath = -Wc,-nodefaultrpaths -+libatomic_darwin_rpath += -Wl,-rpath,@loader_path ++libffi_darwin_rpath = -Wl,-rpath,@loader_path +endif ++libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) \ ++ $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) \ ++ $(libffi_darwin_rpath) + libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep) --libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags) -+libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) \ -+ $(lt_host_flags) $(libatomic_darwin_rpath) - libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \ - fenv.c fence.c flag.c - -diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in -index 80d25653dc7..179f9217ad6 100644 ---- a/libatomic/Makefile.in -+++ b/libatomic/Makefile.in -@@ -403,7 +403,12 @@ noinst_LTLIBRARIES = libatomic_convenience.la - @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = $(top_srcdir)/libatomic.map - @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = libatomic.map-sun - libatomic_version_info = -version-info $(libtool_VERSION) --libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags) -+@ENABLE_DARWIN_AT_RPATH_TRUE@libatomic_darwin_rpath = \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path -+libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) \ -+ $(lt_host_flags) $(libatomic_darwin_rpath) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src +diff --git a/libffi/Makefile.in b/libffi/Makefile.in +index 5524a6a571e..34e77a45d1a 100644 +--- a/libffi/Makefile.in ++++ b/libffi/Makefile.in +@@ -597,7 +597,11 @@ AM_CFLAGS = -Wall -g -fexceptions $(CET_FLAGS) $(am__append_2) + @LIBFFI_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBFFI_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_dep = libffi.map + @LIBFFI_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBFFI_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_dep = libffi.map-sun + libffi_version_info = -version-info `grep -v '^\#' $(srcdir)/libtool-version` +-libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) ++@ENABLE_DARWIN_AT_RPATH_TRUE@libffi_darwin_rpath = -Wl,-rpath,@loader_path ++libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) \ ++ $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) \ ++ $(libffi_darwin_rpath) + - libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \ - fenv.c fence.c flag.c - -diff --git a/libatomic/configure b/libatomic/configure -index 92853dd8a45..935d5559aed 100755 ---- a/libatomic/configure -+++ b/libatomic/configure -@@ -658,6 +658,8 @@ OPT_LDFLAGS - SECTION_LDFLAGS - enable_aarch64_lse - libtool_VERSION -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE -@@ -803,6 +805,7 @@ with_pic - enable_fast_install + libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep) + AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src + AM_CCASFLAGS = $(AM_CPPFLAGS) $(CET_FLAGS) +diff --git a/libffi/configure b/libffi/configure +index 2bb9f8d83d6..069476bc2e6 100755 +--- a/libffi/configure ++++ b/libffi/configure +@@ -667,6 +667,8 @@ MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE + READELF ++ENABLE_DARWIN_AT_RPATH_FALSE ++ENABLE_DARWIN_AT_RPATH_TRUE + CXXCPP + CPP + OTOOL64 +@@ -810,6 +812,7 @@ with_pic + enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath enable_maintainer_mode - enable_symvers - enable_werror -@@ -1452,6 +1455,8 @@ Optional Features: + enable_pax_emutramp + enable_debug +@@ -1465,6 +1468,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -7716,7 +6200,16 @@ index 92853dd8a45..935d5559aed 100755 --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer -@@ -9576,6 +9581,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -7797,7 +7802,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9771,6 +9776,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -7733,8 +6226,9 @@ index 92853dd8a45..935d5559aed 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -7742,15 +6236,16 @@ index 92853dd8a45..935d5559aed 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -7764,175 +6259,42 @@ index 92853dd8a45..935d5559aed 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9593,10 +9639,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9788,9 +9836,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -11382,7 +11437,7 @@ else +@@ -11596,7 +11648,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11385 "configure" -+#line 11440 "configure" +-#line 11599 "configure" ++#line 11651 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11488,7 +11543,7 @@ else +@@ -11702,7 +11754,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11491 "configure" -+#line 11546 "configure" +-#line 11705 "configure" ++#line 11757 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11773,6 +11828,15 @@ fi - - - -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' -+else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= -+fi -+ -+ - # For libtool versioning info, format is CURRENT:REVISION:AGE - libtool_VERSION=3:0:2 - -@@ -15900,6 +15964,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - - if test -z "${LIBAT_BUILD_VERSIONED_SHLIB_TRUE}" && test -z "${LIBAT_BUILD_VERSIONED_SHLIB_FALSE}"; then - as_fn_error $? "conditional \"LIBAT_BUILD_VERSIONED_SHLIB\" was never defined. -diff --git a/libatomic/configure.ac b/libatomic/configure.ac -index 5563551aaae..6b9d3085806 100644 ---- a/libatomic/configure.ac -+++ b/libatomic/configure.ac -@@ -156,6 +156,8 @@ AC_SUBST(enable_shared) - AC_SUBST(enable_static) - AM_MAINTAINER_MODE - -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) -+ - # For libtool versioning info, format is CURRENT:REVISION:AGE - libtool_VERSION=3:0:2 - AC_SUBST(libtool_VERSION) -diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in -index 333980ec2c1..8bc70562e5b 100644 ---- a/libatomic/testsuite/Makefile.in -+++ b/libatomic/testsuite/Makefile.in -@@ -262,6 +262,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+tmake_file = @tmake_file@ - toolexecdir = @toolexecdir@ - toolexeclibdir = @toolexeclibdir@ - top_build_prefix = @top_build_prefix@ -diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp -index 38f3e5673e2..300e5096f79 100644 ---- a/libatomic/testsuite/lib/libatomic.exp -+++ b/libatomic/testsuite/lib/libatomic.exp -@@ -152,6 +152,7 @@ proc libatomic_init { args } { - lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.." - - if [istarget *-*-darwin*] { -+ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" - lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc" - } - -diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in -index 08cdd21fb40..8898251161d 100644 ---- a/libbacktrace/Makefile.in -+++ b/libbacktrace/Makefile.in -@@ -15,7 +15,7 @@ - @SET_MAKE@ - - # Makefile.am -- Backtrace Makefile. --# Copyright (C) 2012-2021 Free Software Foundation, Inc. -+# Copyright (C) 2012-2022 Free Software Foundation, Inc. - - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions are -diff --git a/libbacktrace/backtrace.c b/libbacktrace/backtrace.c -index d28575ec897..cf6491682a7 100644 ---- a/libbacktrace/backtrace.c -+++ b/libbacktrace/backtrace.c -@@ -70,6 +70,13 @@ unwind (struct _Unwind_Context *context, void *vdata) - uintptr_t pc; - int ip_before_insn = 0; - -+#ifdef __APPLE__ -+# undef HAVE_GETIPINFO -+# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 -+# define HAVE_GETIPINFO 1 -+# endif -+#endif -+ - #ifdef HAVE_GETIPINFO - pc = _Unwind_GetIPInfo (context, &ip_before_insn); - #else -diff --git a/libbacktrace/configure b/libbacktrace/configure -index 17f470a4bec..957095aaf1b 100755 ---- a/libbacktrace/configure -+++ b/libbacktrace/configure -@@ -675,6 +675,8 @@ PIC_FLAG - WARN_FLAGS - EXTRA_FLAGS - BACKTRACE_FILE -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - OTOOL64 - OTOOL - LIPO -@@ -799,6 +801,7 @@ with_pic - enable_fast_install - with_gnu_ld - enable_libtool_lock -+enable_darwin_at_rpath - enable_largefile - enable_cet - enable_werror -@@ -1447,6 +1450,8 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -+ --enable-darwin-at-path install libraries with @rpath/library-name, requires -+ rpaths to be added to executables - --disable-largefile omit support for large files - --enable-cet enable Intel CET in target libraries [default=auto] - --disable-werror disable building with -Werror -@@ -9705,6 +9710,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) +@@ -12578,6 +12630,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) + @@ -7948,8 +6310,9 @@ index 17f470a4bec..957095aaf1b 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -7957,15 +6320,16 @@ index 17f470a4bec..957095aaf1b 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -7976,53 +6340,35 @@ index 17f470a4bec..957095aaf1b 100755 +fi + + - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes -@@ -9722,10 +9768,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes +@@ -12595,12 +12690,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi - else - ld_shlibs=no -@@ -11511,7 +11566,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11514 "configure" -+#line 11569 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11617,7 +11672,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11620 "configure" -+#line 11675 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11856,6 +11911,15 @@ CC="$lt_save_CC" - +@@ -14970,6 +15073,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Only expand once: + if test x$enable_darwin_at_rpath = xyes; then @@ -8033,647 +6379,63 @@ index 17f470a4bec..957095aaf1b 100755 + ENABLE_DARWIN_AT_RPATH_FALSE= +fi + -+ - # Check whether --enable-largefile was given. - if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -@@ -14273,6 +14337,10 @@ if test -z "${HAVE_DWZ_TRUE}" && test -z "${HAVE_DWZ_FALSE}"; then - as_fn_error $? "conditional \"HAVE_DWZ\" was never defined. + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args. +@@ -17115,6 +17226,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi - if test -z "${HAVE_ELF_TRUE}" && test -z "${HAVE_ELF_FALSE}"; then - as_fn_error $? "conditional \"HAVE_ELF\" was never defined. + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac -index 597c9705db8..7f89bf33c6b 100644 ---- a/libbacktrace/configure.ac -+++ b/libbacktrace/configure.ac -@@ -84,6 +84,8 @@ AM_CONDITIONAL(HAVE_DWZ, test "$DWZ" != "") - LT_INIT - AM_PROG_LIBTOOL - +diff --git a/libffi/configure.ac b/libffi/configure.ac +index 014d89d0423..716f20ae313 100644 +--- a/libffi/configure.ac ++++ b/libffi/configure.ac +@@ -55,6 +55,7 @@ AC_SUBST(CET_FLAGS) + AM_PROG_AS + AM_PROG_CC_C_O + AC_PROG_LIBTOOL +AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) -+ - AC_SYS_LARGEFILE - - backtrace_supported=yes -diff --git a/libbacktrace/simple.c b/libbacktrace/simple.c -index 6a1a1c92a12..811255ab6b5 100644 ---- a/libbacktrace/simple.c -+++ b/libbacktrace/simple.c -@@ -65,6 +65,13 @@ simple_unwind (struct _Unwind_Context *context, void *vdata) - uintptr_t pc; - int ip_before_insn = 0; - -+#ifdef __APPLE__ -+# undef HAVE_GETIPINFO -+# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 -+# define HAVE_GETIPINFO 1 -+# endif -+#endif -+ - #ifdef HAVE_GETIPINFO - pc = _Unwind_GetIPInfo (context, &ip_before_insn); - #else -diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am -index 6e3a34ff7e2..44d282c7676 100644 ---- a/libcc1/Makefile.am -+++ b/libcc1/Makefile.am -@@ -55,6 +55,10 @@ marshall_c_source = marshall-c.hh - marshall_cxx_source = marshall-cp.hh - - libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym -+if ENABLE_DARWIN_AT_RPATH -+libcc1plugin_la_LDFLAGS += -Wc,-nodefaultrpaths -+libcc1plugin_la_LDFLAGS += -Wl,-rpath,@loader_path -+endif - libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) - libcc1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_C) -@@ -65,6 +69,10 @@ libcc1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(CXXFLAGS) $(libcc1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - libcp1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcp1plugin.sym -+if ENABLE_DARWIN_AT_RPATH -+libcp1plugin_la_LDFLAGS += -Wc,-nodefaultrpaths -+libcp1plugin_la_LDFLAGS += -Wl,-rpath,@loader_path -+endif - libcp1plugin_la_SOURCES = libcp1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_cxx_source) - libcp1plugin.lo_CPPFLAGS = $(CPPFLAGS_FOR_CXX) -@@ -76,6 +84,10 @@ libcp1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + AC_CHECK_TOOL(READELF, readelf) - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) - libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym -+if ENABLE_DARWIN_AT_RPATH -+libcc1_la_LDFLAGS += -Wc,-nodefaultrpaths -+libcc1_la_LDFLAGS += -Wl,-rpath,@loader_path -+endif - libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ - compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) -diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in -index f8f590d71e9..440567a47d2 100644 ---- a/libcc1/Makefile.in -+++ b/libcc1/Makefile.in -@@ -90,6 +90,12 @@ build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ - @DARWIN_DYNAMIC_LOOKUP_TRUE@am__append_1 = -Wl,-undefined,dynamic_lookup -+@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_2 = -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path -+@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_3 = -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path -+@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_4 = -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ -@@ -405,7 +411,8 @@ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ - - marshall_c_source = marshall-c.hh - marshall_cxx_source = marshall-cp.hh --libcc1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1plugin.sym -+libcc1plugin_la_LDFLAGS = -module -export-symbols \ -+ $(srcdir)/libcc1plugin.sym $(am__append_2) - libcc1plugin_la_SOURCES = libcc1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_c_source) - -@@ -416,7 +423,8 @@ libcc1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libcc1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - --libcp1plugin_la_LDFLAGS = -module -export-symbols $(srcdir)/libcp1plugin.sym -+libcp1plugin_la_LDFLAGS = -module -export-symbols \ -+ $(srcdir)/libcp1plugin.sym $(am__append_3) - libcp1plugin_la_SOURCES = libcp1plugin.cc context.cc context.hh \ - $(shared_source) $(marshall_cxx_source) - -@@ -428,7 +436,8 @@ libcp1plugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(CXXFLAGS) $(libcp1plugin_la_LDFLAGS) $(LTLDFLAGS) -o $@ - - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) --libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym -+libcc1_la_LDFLAGS = -module -export-symbols $(srcdir)/libcc1.sym \ -+ $(am__append_4) - libcc1_la_SOURCES = findcomp.cc libcc1.cc libcp1.cc \ - compiler.cc compiler.hh names.cc names.hh $(shared_source) \ - $(marshall_c_source) $(marshall_cxx_source) -diff --git a/libcc1/configure b/libcc1/configure -index 01cfb2806da..42fb85a4047 100755 ---- a/libcc1/configure -+++ b/libcc1/configure -@@ -646,6 +646,8 @@ gcc_version - get_gcc_base_ver - CET_HOST_FLAGS - visibility -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - CXXCPP - am__fastdepCXX_FALSE - am__fastdepCXX_TRUE -@@ -787,6 +789,7 @@ with_pic - enable_fast_install - with_gnu_ld - enable_libtool_lock -+enable_darwin_at_rpath - enable_cet - with_gcc_major_version_only - enable_werror_always -@@ -1439,6 +1442,8 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -+ --enable-darwin-at-path install libraries with @rpath/library-name, requires -+ rpaths to be added to executables - --enable-cet enable Intel CET in host libraries [default=auto] - --enable-werror-always enable -Werror despite compiler version - --enable-plugin enable plugin support -@@ -8971,6 +8976,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) +diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp +index 15d3d5ebd73..611f5177c7a 100644 +--- a/libffi/testsuite/lib/libffi.exp ++++ b/libffi/testsuite/lib/libffi.exp +@@ -337,8 +337,13 @@ proc libffi-init { args } { + verbose "libffi_dir $libffi_dir" + if { $libffi_dir != "" } { + set libffi_dir [file dirname ${libffi_dir}] +- set libffi_link_flags "-L${libffi_dir}/.libs" +- lappend libffi_link_flags "-L${blddircxx}/src/.libs" ++ if [istarget *-*-darwin*] { ++ set libffi_link_flags "-B${libffi_dir}/.libs" ++ lappend libffi_link_flags "-B${blddircxx}/src/.libs" ++ } else { ++ set libffi_link_flags "-L${libffi_dir}/.libs" ++ lappend libffi_link_flags "-L${blddircxx}/src/.libs" ++ } + } + set_ld_library_path_env_vars +@@ -382,7 +387,7 @@ proc libffi_target_compile { source dest type options } { + # Darwin needs a stack execution allowed flag. -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac -+ -+fi -+ -+ - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes -@@ -8988,10 +9034,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - - else - ld_shlibs=no -@@ -10777,7 +10832,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10780 "configure" -+#line 10835 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10883,7 +10938,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10886 "configure" -+#line 10941 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12165,6 +12220,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) - - -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac -+ -+fi -+ -+ - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes -@@ -12182,12 +12278,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ fi - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - -@@ -14518,6 +14627,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' -+else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= -+fi -+ - - visibility= - if test "$GXX" = yes; then -@@ -15369,6 +15486,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${DARWIN_DYNAMIC_LOOKUP_TRUE}" && test -z "${DARWIN_DYNAMIC_LOOKUP_FALSE}"; then - as_fn_error $? "conditional \"DARWIN_DYNAMIC_LOOKUP\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libcc1/configure.ac b/libcc1/configure.ac -index 36f5a7e09f1..e8d068e0ac4 100644 ---- a/libcc1/configure.ac -+++ b/libcc1/configure.ac -@@ -38,6 +38,7 @@ AM_MAINTAINER_MODE - LT_INIT([disable-static]) - AM_PROG_LIBTOOL - AC_PROG_CXX -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) - - visibility= - if test "$GXX" = yes; then -diff --git a/libffi/Makefile.am b/libffi/Makefile.am -index c6d6f849c53..d2ae0c04c7b 100644 ---- a/libffi/Makefile.am -+++ b/libffi/Makefile.am -@@ -214,7 +214,12 @@ libffi.map: $(top_srcdir)/libffi.map.in - $(COMPILE) -D$(TARGET) -DGENERATE_LIBFFI_MAP \ - -E -x assembler-with-cpp -o $@ $(top_srcdir)/libffi.map.in - --libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) -+if ENABLE_DARWIN_AT_RPATH -+libffi_darwin_rpath = -Wl,-rpath,@loader_path -+endif -+libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) \ -+ $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) \ -+ $(libffi_darwin_rpath) - libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep) - - AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -diff --git a/libffi/Makefile.in b/libffi/Makefile.in -index 5524a6a571e..34e77a45d1a 100644 ---- a/libffi/Makefile.in -+++ b/libffi/Makefile.in -@@ -597,7 +597,11 @@ AM_CFLAGS = -Wall -g -fexceptions $(CET_FLAGS) $(am__append_2) - @LIBFFI_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBFFI_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_dep = libffi.map - @LIBFFI_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBFFI_BUILD_VERSIONED_SHLIB_TRUE@libffi_version_dep = libffi.map-sun - libffi_version_info = -version-info `grep -v '^\#' $(srcdir)/libtool-version` --libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) -+@ENABLE_DARWIN_AT_RPATH_TRUE@libffi_darwin_rpath = -Wl,-rpath,@loader_path -+libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) \ -+ $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS) \ -+ $(libffi_darwin_rpath) -+ - libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep) - AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src - AM_CCASFLAGS = $(AM_CPPFLAGS) $(CET_FLAGS) -diff --git a/libffi/configure b/libffi/configure -index 575641cca1d..002320ca302 100755 ---- a/libffi/configure -+++ b/libffi/configure -@@ -667,6 +667,8 @@ MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE - READELF -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - CXXCPP - CPP - OTOOL64 -@@ -810,6 +812,7 @@ with_pic - enable_fast_install - with_gnu_ld - enable_libtool_lock -+enable_darwin_at_rpath - enable_maintainer_mode - enable_pax_emutramp - enable_debug -@@ -1465,6 +1468,8 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -+ --enable-darwin-at-path install libraries with @rpath/library-name, requires -+ rpaths to be added to executables - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer -@@ -9766,6 +9771,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) - - -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac -+ -+fi -+ -+ - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes -@@ -9783,10 +9829,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - - else - ld_shlibs=no -@@ -11572,7 +11627,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11575 "configure" -+#line 11630 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11678,7 +11733,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11681 "configure" -+#line 11736 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12554,6 +12609,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) - - -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac -+ -+fi -+ -+ - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes -@@ -12571,12 +12667,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ fi - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - -@@ -14926,6 +15035,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Only expand once: - - -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' -+else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= -+fi -+ - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args. -@@ -17071,6 +17188,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libffi/configure.ac b/libffi/configure.ac -index 014d89d0423..716f20ae313 100644 ---- a/libffi/configure.ac -+++ b/libffi/configure.ac -@@ -55,6 +55,7 @@ AC_SUBST(CET_FLAGS) - AM_PROG_AS - AM_PROG_CC_C_O - AC_PROG_LIBTOOL -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) - - AC_CHECK_TOOL(READELF, readelf) - + if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] +- || [istarget "*-*-darwin2*"] } { ++ || [istarget "x86_64-*-darwin2*"] } { + lappend options "additional_flags=-Wl,-allow_stack_execute" + lappend options "additional_flags=-Wl,-search_paths_first" + } diff --git a/libgcc/config.host b/libgcc/config.host -index 8c56fcae5d2..48eed32e195 100644 +index 9d7212028d0..018dfe79d82 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -82,7 +82,7 @@ m32c*-*-*) @@ -8685,10 +6447,10 @@ index 8c56fcae5d2..48eed32e195 100644 cpu_type=aarch64 ;; alpha*-*-*) -@@ -241,7 +241,46 @@ case ${host} in +@@ -251,7 +251,29 @@ case ${host} in + echo "Warning: libgcc configured to support macOS 10.5" 1>&2 ;; esac - tmake_file="$tmake_file t-slibgcc-darwin" - extra_parts="crt3.o libd10-uwfef.a crttms.o crttme.o libemutls_w.a" + # We are not using libtool to build the libs here, so we need to replicate + # a little of the logic around setting Darwin rpaths. Setting an explicit @@ -8712,29 +6474,12 @@ index 8c56fcae5d2..48eed32e195 100644 + if test "x$enable_darwin_at_rpath" = "xyes"; then + tmake_file="$tmake_file t-darwin-rpath " + fi -+ case ${host} in -+ *-*-darwin2* | *-*-darwin1[89]* | aarch64*-*-darwin*) -+ tmake_file="t-darwin-min-8 $tmake_file" -+ ;; -+ *-*-darwin9* | *-*-darwin1[0-7]*) -+ tmake_file="t-darwin-min-5 $tmake_file" -+ ;; -+ *-*-darwin[4-8]*) -+ tmake_file="t-darwin-min-1 $tmake_file" -+ ;; -+ *) -+ # Fall back to configuring for the oldest system known to work with -+ # all archs and the current sources. -+ tmake_file="t-darwin-min-5 $tmake_file" -+ echo "Warning: libgcc configured to support macOS 10.5" 1>&2 -+ ;; -+ esac -+ extra_parts="crt3.o crttms.o crttme.o libemutls_w.a" ++ extra_parts="crt3.o crttms.o crttme.o libemutls_w.a " ;; *-*-dragonfly*) tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip" -@@ -384,6 +423,17 @@ aarch64*-*-elf | aarch64*-*-rtems*) - tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" +@@ -395,6 +417,17 @@ aarch64*-*-elf | aarch64*-*-rtems*) + tmake_file="${tmake_file} t-dfprules" md_unwind_header=aarch64/aarch64-unwind.h ;; +aarch64*-*-darwin*) @@ -8742,7 +6487,7 @@ index 8c56fcae5d2..48eed32e195 100644 + tmake_file="${tmake_file} ${cpu_type}/t-aarch64" + tmake_file="${tmake_file} ${cpu_type}/t-lse " + tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp " -+ tmake_file="${tmake_file} t-crtfm" ++ tmake_file="${tmake_file} t-crtfm t-dfprules" + md_unwind_header=aarch64/aarch64-unwind.h + if test x$off_stack_trampolines = xyes; then + tmake_file="${tmake_file} ${cpu_type}/t-heap-trampoline" @@ -8751,17 +6496,17 @@ index 8c56fcae5d2..48eed32e195 100644 aarch64*-*-freebsd*) extra_parts="$extra_parts crtfastmath.o" tmake_file="${tmake_file} ${cpu_type}/t-aarch64" -@@ -408,6 +458,9 @@ aarch64*-*-linux*) - tmake_file="${tmake_file} ${cpu_type}/t-aarch64" +@@ -423,6 +456,9 @@ aarch64*-*-linux*) tmake_file="${tmake_file} ${cpu_type}/t-lse t-slibgcc-libgcc" tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm" + tmake_file="${tmake_file} t-dfprules" + if test x$off_stack_trampolines = xyes; then + tmake_file="${tmake_file} ${cpu_type}/t-heap-trampoline" + fi ;; aarch64*-*-vxworks7*) extra_parts="$extra_parts crtfastmath.o" -@@ -701,12 +754,17 @@ hppa*-*-netbsd*) +@@ -691,12 +727,17 @@ hppa*-*-netbsd*) i[34567]86-*-darwin*) tmake_file="$tmake_file i386/t-crtpc t-crtfm i386/t-msabi" tm_file="$tm_file i386/darwin-lib.h" @@ -8779,7 +6524,7 @@ index 8c56fcae5d2..48eed32e195 100644 ;; i[34567]86-*-elfiamcu) tmake_file="$tmake_file i386/t-crtstuff t-softfp-sfdftf i386/32/t-softfp i386/32/t-iamcu i386/t-softfp t-softfp t-dfprules" -@@ -773,6 +831,9 @@ x86_64-*-linux*) +@@ -763,6 +804,9 @@ x86_64-*-linux*) tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules" tm_file="${tm_file} i386/elf-lib.h" md_unwind_header=i386/linux-unwind.h @@ -8789,7 +6534,7 @@ index 8c56fcae5d2..48eed32e195 100644 ;; x86_64-*-kfreebsd*-gnu) extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" -@@ -1169,12 +1230,14 @@ powerpc-*-darwin*) +@@ -1171,12 +1215,14 @@ powerpc-*-darwin*) # We build the darwin10 EH shim for Rosetta (running on x86 machines). tm_file="$tm_file i386/darwin-lib.h" tmake_file="$tmake_file rs6000/t-ppc64-fp rs6000/t-ibm-ldouble" @@ -8983,7 +6728,7 @@ index 00000000000..c8b83681ed7 + } +} diff --git a/libgcc/config/aarch64/lse.S b/libgcc/config/aarch64/lse.S -index 9c29cf08b59..97b68c42cc1 100644 +index dde3a28e07b..87ee33bc52a 100644 --- a/libgcc/config/aarch64/lse.S +++ b/libgcc/config/aarch64/lse.S @@ -58,7 +58,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -9037,10 +6782,10 @@ index 9c29cf08b59..97b68c42cc1 100644 STARTFN NAME(cas) diff --git a/libgcc/config/aarch64/sfp-machine.h b/libgcc/config/aarch64/sfp-machine.h -index be9b42174c4..5dc1827ee3a 100644 +index 97c38a34c86..b35e2c5e29a 100644 --- a/libgcc/config/aarch64/sfp-machine.h +++ b/libgcc/config/aarch64/sfp-machine.h -@@ -122,6 +122,27 @@ void __sfp_handle_exceptions (int); +@@ -124,6 +124,27 @@ void __sfp_handle_exceptions (int); /* Define ALIASNAME as a strong alias for NAME. */ @@ -9210,982 +6955,550 @@ index 00000000000..96e13bf828e + + p->trampolines = allocate_trampoline_page (); + -+ if (p->trampolines == MAP_FAILED) -+ return NULL; -+ -+ p->prev = parent; -+ p->free_trampolines = get_trampolines_per_page(); -+ -+ return p; -+} -+ -+void -+__builtin_nested_func_ptr_created (void *chain, void *func, void **dst) -+{ -+ if (tramp_ctrl_curr == NULL) -+ { -+ tramp_ctrl_curr = allocate_tramp_ctrl (NULL); -+ if (tramp_ctrl_curr == NULL) -+ abort (); -+ } -+ -+ if (tramp_ctrl_curr->free_trampolines == 0) -+ { -+ void *tramp_ctrl = allocate_tramp_ctrl (tramp_ctrl_curr); -+ if (!tramp_ctrl) -+ abort (); -+ -+ tramp_ctrl_curr = tramp_ctrl; -+ } -+ -+ union ix86_trampoline *trampoline -+ = &tramp_ctrl_curr->trampolines[get_trampolines_per_page () -+ - tramp_ctrl_curr->free_trampolines]; -+ -+#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400 -+ /* Disable write protection for the MAP_JIT regions in this thread (see -+ https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon) */ -+ pthread_jit_write_protect_np (0); -+#endif -+ -+ memcpy (trampoline->insns, trampoline_insns, -+ sizeof(trampoline_insns)); -+ trampoline->fields.func_ptr = func; -+ trampoline->fields.chain_ptr = chain; -+ -+#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400 -+ /* Re-enable write protection. */ -+ pthread_jit_write_protect_np (1); -+#endif -+ -+ tramp_ctrl_curr->free_trampolines -= 1; -+ -+ __builtin___clear_cache ((void *)trampoline->insns, -+ ((void *)trampoline->insns + sizeof(trampoline->insns))); -+ -+ *dst = &trampoline->insns; -+} -+ -+void -+__builtin_nested_func_ptr_deleted (void) -+{ -+ if (tramp_ctrl_curr == NULL) -+ abort (); -+ -+ tramp_ctrl_curr->free_trampolines += 1; -+ -+ if (tramp_ctrl_curr->free_trampolines == get_trampolines_per_page ()) -+ { -+ if (tramp_ctrl_curr->prev == NULL) -+ return; -+ -+ munmap (tramp_ctrl_curr->trampolines, getpagesize()); -+ struct tramp_ctrl_data *prev = tramp_ctrl_curr->prev; -+ free (tramp_ctrl_curr); -+ tramp_ctrl_curr = prev; -+ } -+} -diff --git a/libgcc/config/i386/t-heap-trampoline b/libgcc/config/i386/t-heap-trampoline -new file mode 100644 -index 00000000000..76f438d9529 ---- /dev/null -+++ b/libgcc/config/i386/t-heap-trampoline -@@ -0,0 +1,20 @@ -+# Copyright The GNU Toolchain Authors. -+ -+# This file is part of GCC. -+# -+# GCC is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+# -+# GCC 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 -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GCC; see the file COPYING3. If not see -+# . -+ -+LIB2ADD += $(srcdir)/config/i386/heap-trampoline.c -+HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.8 -diff --git a/libgcc/config/t-darwin b/libgcc/config/t-darwin -index 299d26c2c96..a708583d965 100644 ---- a/libgcc/config/t-darwin -+++ b/libgcc/config/t-darwin -@@ -1,15 +1,15 @@ - # Set this as a minimum (unless overriden by arch t-files) since it's a - # reasonable lowest common denominator that works for all our archs. --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.4 -+HOST_LIBGCC2_CFLAGS += $(DARWIN_MIN_LIB_VERSION) - - crt3.o: $(srcdir)/config/darwin-crt3.c -- $(crt_compile) -mmacosx-version-min=10.4 -c $< -+ $(crt_compile) $(DARWIN_MIN_CRT_VERSION) -c $< - - crttms.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DSTART -c $< -+ $(crt_compile) $(DARWIN_MIN_CRT_VERSION) -DSTART -c $< - - crttme.o: $(srcdir)/config/darwin-crt-tm.c -- $(crt_compile) -mmacosx-version-min=10.4 -DEND -c $< -+ $(crt_compile) $(DARWIN_MIN_CRT_VERSION) -DEND -c $< - - # Make emutls weak so that we can deal with -static-libgcc, override the - # hidden visibility when this is present in libgcc_eh. -@@ -24,7 +24,8 @@ libemutls_w.a: emutls_s.o - $(AR_CREATE_FOR_TARGET) $@ $< - $(RANLIB_FOR_TARGET) $@ - --# Patch to __Unwind_Find_Enclosing_Function for Darwin10. -+# This has to be built for 10.6, even if the toolchain will not target that -+# version - d10-uwfef.o: $(srcdir)/config/darwin10-unwind-find-enc-func.c libgcc_tm.h - $(crt_compile) -mmacosx-version-min=10.6 -c $< - -diff --git a/libgcc/config/t-darwin-min-1 b/libgcc/config/t-darwin-min-1 -new file mode 100644 -index 00000000000..8c2cf8acd39 ---- /dev/null -+++ b/libgcc/config/t-darwin-min-1 -@@ -0,0 +1,3 @@ -+# Support building with -mmacosx-version-min back to 10.1. -+DARWIN_MIN_LIB_VERSION = -mmacosx-version-min=10.4 -+DARWIN_MIN_CRT_VERSION = -mmacosx-version-min=10.1 -diff --git a/libgcc/config/t-darwin-min-4 b/libgcc/config/t-darwin-min-4 -new file mode 100644 -index 00000000000..04e980de4d5 ---- /dev/null -+++ b/libgcc/config/t-darwin-min-4 -@@ -0,0 +1,3 @@ -+# Support building with -mmacosx-version-min back to 10.4. -+DARWIN_MIN_LIB_VERSION = -mmacosx-version-min=10.4 -+DARWIN_MIN_CRT_VERSION = -mmacosx-version-min=10.4 -diff --git a/libgcc/config/t-darwin-min-5 b/libgcc/config/t-darwin-min-5 -new file mode 100644 -index 00000000000..138193151e7 ---- /dev/null -+++ b/libgcc/config/t-darwin-min-5 -@@ -0,0 +1,3 @@ -+# Support building with -mmacosx-version-min back to 10.5. -+DARWIN_MIN_LIB_VERSION = -mmacosx-version-min=10.5 -+DARWIN_MIN_CRT_VERSION = -mmacosx-version-min=10.5 -diff --git a/libgcc/config/t-darwin-min-8 b/libgcc/config/t-darwin-min-8 -new file mode 100644 -index 00000000000..9efc9dc0257 ---- /dev/null -+++ b/libgcc/config/t-darwin-min-8 -@@ -0,0 +1,3 @@ -+# Support building with -mmacosx-version-min back to 10.8. -+DARWIN_MIN_LIB_VERSION = -mmacosx-version-min=10.8 -+DARWIN_MIN_CRT_VERSION = -mmacosx-version-min=10.8 -diff --git a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath -new file mode 100644 -index 00000000000..951539de7aa ---- /dev/null -+++ b/libgcc/config/t-darwin-rpath -@@ -0,0 +1,5 @@ -+# Use @rpath and add a search path to exes and dylibs that depend on this. -+SHLIB_RPATH = @rpath ++ if (p->trampolines == MAP_FAILED) ++ return NULL; + -+# Enable the libgcc_s.1.dylib compatibility lib to find the dependent 1.1.dylib. -+SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path -diff --git a/libgcc/config/t-slibgcc-darwin b/libgcc/config/t-slibgcc-darwin -index a8f69666a82..ee449de32e6 100644 ---- a/libgcc/config/t-slibgcc-darwin -+++ b/libgcc/config/t-slibgcc-darwin -@@ -1,4 +1,4 @@ --# Build a shared libgcc library with the darwin linker. -+# Build a shared libgcc library able to use embedded runpaths. - - SHLIB_SOVERSION = 1.1 - SHLIB_SO_MINVERSION = 1 -@@ -6,7 +6,6 @@ SHLIB_VERSTRING = -compatibility_version $(SHLIB_SO_MINVERSION) \ - -current_version $(SHLIB_SOVERSION) - SHLIB_EXT = .dylib - SHLIB_LC = -lSystem --SHLIB_INSTALL_DIR = $(slibdir) - - SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk - SHLIB_MKMAP_OPTS = -v leading_underscore=1 -@@ -23,11 +22,20 @@ SHLIB_SONAME = @shlib_base_name@$(SHLIB_EXT) - # subdir. The code under MULTIBUILDTOP combines these into a single FAT - # library, that is what we eventually install. - -+# When enable_darwin_at_rpath is true, use @rpath instead of $(slibdir) for -+# this and dylibs that depend on this. So this def must come first and be -+# overridden in a make fragment that depends on the rpath setting. -+SHLIB_RPATH = $(slibdir) ++ p->prev = parent; ++ p->free_trampolines = get_trampolines_per_page(); + -+# Likewise, we only want to add an @loader_path to the shared libs when -+# we have enable_darwin_at_rpath. -+SHLIB_LOADER_PATH = ++ return p; ++} + - SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \ -- -install_name $(SHLIB_INSTALL_DIR)/$(SHLIB_INSTALL_NAME) \ -+ -install_name $(SHLIB_RPATH)/$(SHLIB_INSTALL_NAME) \ - -single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME) \ - -Wl,-exported_symbols_list,$(SHLIB_MAP) \ -- $(SHLIB_VERSTRING) \ -+ $(SHLIB_VERSTRING) -nodefaultrpaths \ - @multilib_flags@ @shlib_objs@ $(SHLIB_LC) - - # we do our own thing -@@ -63,9 +71,9 @@ EHS_INSTNAME = libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT) - libgcc_ehs$(SHLIB_EXT): $(LIBEHSOBJS) $(extra-parts) - mkdir -p $(MULTIDIR) - $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \ -- -install_name $(SHLIB_INSTALL_DIR)/$(EHS_INSTNAME) \ -+ -install_name $(SHLIB_RPATH)/$(EHS_INSTNAME) \ - -o $(MULTIDIR)/libgcc_ehs$(SHLIB_EXT) $(SHLIB_VERSTRING) \ -- $(LIBEHSOBJS) $(SHLIB_LC) -+ -nodefaultrpaths $(LIBEHSOBJS) $(SHLIB_LC) - - all: libgcc_ehs$(SHLIB_EXT) - -@@ -121,12 +129,13 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) \ - cp ../$${mlib}/libgcc/$${mlib}/libgcc_ehs$(SHLIB_EXT) \ - ./libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} || exit 1 ; \ - arch=`$(LIPO) -info libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} | sed -e 's/.*:\ //'` ; \ -- $(CC) -arch $${arch} -nodefaultlibs -dynamiclib \ -+ $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ -+ $(SHLIB_LOADER_PATH) \ - -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ - -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ - -Wl,-reexport_library,libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ -- -install_name $(SHLIB_INSTALL_DIR)/libgcc_s.1.dylib \ -- -compatibility_version 1 -current_version 1 ; \ -+ -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ -+ -compatibility_version 1 -current_version 1.1 ; \ - done - $(LIPO) -output libgcc_s.1$(SHLIB_EXT) -create libgcc_s.1$(SHLIB_EXT)_T* - rm libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* -@@ -140,13 +149,14 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) - cp ../$${mlib}/libgcc/$${mlib}/libgcc_s$(SHLIB_EXT) \ - ./libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} || exit 1 ; \ - arch=`$(LIPO) -info libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} | sed -e 's/.*:\ //'` ; \ -- $(CC) -arch $${arch} -nodefaultlibs -dynamiclib \ -+ $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ -+ $(SHLIB_LOADER_PATH) \ - -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ - -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ - -lSystem \ - -Wl,-reexported_symbols_list,$(srcdir)/config/darwin-unwind.ver \ -- -install_name $(SHLIB_INSTALL_DIR)/libgcc_s.1.dylib \ -- -compatibility_version 1 -current_version 1 ; \ -+ -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ -+ -compatibility_version 1 -current_version 1.1 ; \ - done - $(LIPO) -output libgcc_s.1$(SHLIB_EXT) -create libgcc_s.1$(SHLIB_EXT)_T* - rm libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* -diff --git a/libgcc/configure b/libgcc/configure -index 1f9b2ac578b..a5c228bc3a1 100755 ---- a/libgcc/configure -+++ b/libgcc/configure -@@ -630,7 +630,6 @@ LIPO - AR - toolexeclibdir - toolexecdir --enable_gcov - target_subdir - host_subdir - build_subdir -@@ -654,6 +653,8 @@ build_cpu - build - with_aix_soname - enable_vtable_verify -+enable_gcov -+off_stack_trampolines - enable_shared - libgcc_topdir - target_alias -@@ -701,6 +702,8 @@ with_target_subdir - with_cross_host - with_ld - enable_shared -+enable_off_stack_trampolines -+enable_gcov - enable_vtable_verify - with_aix_soname - enable_version_specific_runtime_libs -@@ -708,7 +711,6 @@ with_toolexeclibdir - with_slibdir - enable_maintainer_mode - with_build_libsubdir --enable_gcov - enable_largefile - enable_decimal_float - with_system_libunwind -@@ -1342,12 +1344,15 @@ Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-shared don't provide a shared libgcc -+ --enable-off-stack-trampolines -+ Specify whether to support generating off-stack trampolines ++void ++__builtin_nested_func_ptr_created (void *chain, void *func, void **dst) ++{ ++ if (tramp_ctrl_curr == NULL) ++ { ++ tramp_ctrl_curr = allocate_tramp_ctrl (NULL); ++ if (tramp_ctrl_curr == NULL) ++ abort (); ++ } + -+ --disable-gcov don't provide libgcov and related host tools - --enable-vtable-verify Enable vtable verification feature - --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer -- --disable-gcov don't provide libgcov and related host tools - --disable-largefile omit support for large files - --enable-decimal-float={no,yes,bid,dpd} - enable decimal float extension to C. Selecting 'bid' -@@ -2252,6 +2257,48 @@ fi - - - -+# Check whether --enable-off-stack-trampolines was given. -+if test "${enable_off_stack_trampolines+set}" = set; then : -+ enableval=$enable_off_stack_trampolines; -+case "$target" in -+ x86_64-*-linux* | x86_64-*-darwin1[4-9]* | x86_64-*-darwin2*) -+ off_stack_trampolines=$enableval -+ ;; -+ aarch64*-*-linux* ) -+ off_stack_trampolines=$enableval -+ ;; -+ aarch64*-*darwin* ) -+ off_stack_trampolines=$enableval -+ ;; -+ *) -+ as_fn_error $? "Configure option --enable-off-stack-trampolines is not supported \ -+for this platform" "$LINENO" 5 -+ off_stack_trampolines=no -+ ;; -+esac -+else ++ if (tramp_ctrl_curr->free_trampolines == 0) ++ { ++ void *tramp_ctrl = allocate_tramp_ctrl (tramp_ctrl_curr); ++ if (!tramp_ctrl) ++ abort (); + -+case "$target" in -+ *-*-darwin2*) -+ off_stack_trampolines=yes -+ ;; -+ *) -+ off_stack_trampolines=no -+ ;; -+esac -+fi ++ tramp_ctrl_curr = tramp_ctrl; ++ } ++ ++ union ix86_trampoline *trampoline ++ = &tramp_ctrl_curr->trampolines[get_trampolines_per_page () ++ - tramp_ctrl_curr->free_trampolines]; ++ ++#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400 ++ /* Disable write protection for the MAP_JIT regions in this thread (see ++ https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon) */ ++ pthread_jit_write_protect_np (0); ++#endif + ++ memcpy (trampoline->insns, trampoline_insns, ++ sizeof(trampoline_insns)); ++ trampoline->fields.func_ptr = func; ++ trampoline->fields.chain_ptr = chain; + ++#if __APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400 ++ /* Re-enable write protection. */ ++ pthread_jit_write_protect_np (1); ++#endif + -+# Check whether --enable-gcov was given. -+if test "${enable_gcov+set}" = set; then : -+ enableval=$enable_gcov; -+else -+ enable_gcov=yes -+fi ++ tramp_ctrl_curr->free_trampolines -= 1; + ++ __builtin___clear_cache ((void *)trampoline->insns, ++ ((void *)trampoline->insns + sizeof(trampoline->insns))); + ++ *dst = &trampoline->insns; ++} + - # Check whether --enable-vtable-verify was given. - if test "${enable_vtable_verify+set}" = set; then : - enableval=$enable_vtable_verify; case "$enableval" in -diff --git a/libgcc/configure.ac b/libgcc/configure.ac -index 2fc9d5d7c93..7d11bf00142 100644 ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -68,6 +68,40 @@ AC_ARG_ENABLE(shared, - ], [enable_shared=yes]) - AC_SUBST(enable_shared) - -+AC_ARG_ENABLE([off-stack-trampolines], -+ [AS_HELP_STRING([--enable-off-stack-trampolines] -+ [Specify whether to support generating off-stack trampolines])],[ -+case "$target" in -+ x86_64-*-linux* | x86_64-*-darwin1[[4-9]]* | x86_64-*-darwin2*) -+ off_stack_trampolines=$enableval -+ ;; -+ aarch64*-*-linux* ) -+ off_stack_trampolines=$enableval -+ ;; -+ aarch64*-*darwin* ) -+ off_stack_trampolines=$enableval -+ ;; -+ *) -+ AC_MSG_ERROR([Configure option --enable-off-stack-trampolines is not supported \ -+for this platform]) -+ off_stack_trampolines=no -+ ;; -+esac],[ -+case "$target" in -+ *-*-darwin2*) -+ off_stack_trampolines=yes -+ ;; -+ *) -+ off_stack_trampolines=no -+ ;; -+esac]) -+AC_SUBST(off_stack_trampolines) ++void ++__builtin_nested_func_ptr_deleted (void) ++{ ++ if (tramp_ctrl_curr == NULL) ++ abort (); + -+AC_ARG_ENABLE(gcov, -+[ --disable-gcov don't provide libgcov and related host tools], -+[], [enable_gcov=yes]) -+AC_SUBST(enable_gcov) ++ tramp_ctrl_curr->free_trampolines += 1; + - AC_ARG_ENABLE(vtable-verify, - [ --enable-vtable-verify Enable vtable verification feature ], - [case "$enableval" in -diff --git a/libgcc/libgcc-std.ver.in b/libgcc/libgcc-std.ver.in -index 513ddd0bd0d..fc0b4052a3b 100644 ---- a/libgcc/libgcc-std.ver.in -+++ b/libgcc/libgcc-std.ver.in -@@ -1943,4 +1943,7 @@ GCC_4.8.0 { - GCC_7.0.0 { - __PFX__divmoddi4 - __PFX__divmodti4 ++ if (tramp_ctrl_curr->free_trampolines == get_trampolines_per_page ()) ++ { ++ if (tramp_ctrl_curr->prev == NULL) ++ return; + -+ __builtin_nested_func_ptr_created -+ __builtin_nested_func_ptr_deleted - } -diff --git a/libgcc/libgcc2.h b/libgcc/libgcc2.h -index fc24ac34502..536e517b62f 100644 ---- a/libgcc/libgcc2.h -+++ b/libgcc/libgcc2.h -@@ -29,6 +29,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - #pragma GCC visibility push(default) - #endif - -+extern void __builtin_nested_func_ptr_created (void *, void *, void **); -+extern void __builtin_nested_func_ptr_deleted (void); ++ munmap (tramp_ctrl_curr->trampolines, getpagesize()); ++ struct tramp_ctrl_data *prev = tramp_ctrl_curr->prev; ++ free (tramp_ctrl_curr); ++ tramp_ctrl_curr = prev; ++ } ++} +diff --git a/libgcc/config/i386/t-heap-trampoline b/libgcc/config/i386/t-heap-trampoline +new file mode 100644 +index 00000000000..76f438d9529 +--- /dev/null ++++ b/libgcc/config/i386/t-heap-trampoline +@@ -0,0 +1,20 @@ ++# Copyright The GNU Toolchain Authors. + - extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t); - extern void __clear_cache (void *, void *); - extern void __eprintf (const char *, const char *, unsigned int, const char *) -diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am -index 5ce0cd7cd05..2073bf6c5ef 100644 ---- a/libgfortran/Makefile.am -+++ b/libgfortran/Makefile.am -@@ -37,6 +37,11 @@ else - version_arg = - version_dep = - endif -+extra_darwin_ldflags_libgfortran = @extra_ldflags_libgfortran@ -+if ENABLE_DARWIN_AT_RPATH -+extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths -+extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path -+endif - - gfor_c_HEADERS = ISO_Fortran_binding.h - gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include -@@ -50,7 +55,7 @@ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) - libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ - $(HWCAP_LDFLAGS) \ -- $(LIBM) $(extra_ldflags_libgfortran) \ -+ $(LIBM) $(extra_darwin_ldflags_libgfortran) \ - $(version_arg) -Wc,-shared-libgcc - libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) - -diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in -index 7ac6bfba657..52dd5f1819e 100644 ---- a/libgfortran/Makefile.in -+++ b/libgfortran/Makefile.in -@@ -91,8 +91,10 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --@LIBGFOR_MINIMAL_TRUE@am__append_1 = -DLIBGFOR_MINIMAL --@LIBGFOR_MINIMAL_FALSE@am__append_2 = \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path -+@LIBGFOR_MINIMAL_TRUE@am__append_2 = -DLIBGFOR_MINIMAL -+@LIBGFOR_MINIMAL_FALSE@am__append_3 = \ - @LIBGFOR_MINIMAL_FALSE@io/close.c \ - @LIBGFOR_MINIMAL_FALSE@io/file_pos.c \ - @LIBGFOR_MINIMAL_FALSE@io/format.c \ -@@ -110,7 +112,7 @@ target_triplet = @target@ - @LIBGFOR_MINIMAL_FALSE@io/fbuf.c \ - @LIBGFOR_MINIMAL_FALSE@io/async.c - --@LIBGFOR_MINIMAL_FALSE@am__append_3 = \ -+@LIBGFOR_MINIMAL_FALSE@am__append_4 = \ - @LIBGFOR_MINIMAL_FALSE@intrinsics/access.c \ - @LIBGFOR_MINIMAL_FALSE@intrinsics/c99_functions.c \ - @LIBGFOR_MINIMAL_FALSE@intrinsics/chdir.c \ -@@ -143,9 +145,9 @@ target_triplet = @target@ - @LIBGFOR_MINIMAL_FALSE@intrinsics/umask.c \ - @LIBGFOR_MINIMAL_FALSE@intrinsics/unlink.c - --@IEEE_SUPPORT_TRUE@am__append_4 = ieee/ieee_helper.c --@LIBGFOR_MINIMAL_TRUE@am__append_5 = runtime/minimal.c --@LIBGFOR_MINIMAL_FALSE@am__append_6 = \ -+@IEEE_SUPPORT_TRUE@am__append_5 = ieee/ieee_helper.c -+@LIBGFOR_MINIMAL_TRUE@am__append_6 = runtime/minimal.c -+@LIBGFOR_MINIMAL_FALSE@am__append_7 = \ - @LIBGFOR_MINIMAL_FALSE@runtime/backtrace.c \ - @LIBGFOR_MINIMAL_FALSE@runtime/convert_char.c \ - @LIBGFOR_MINIMAL_FALSE@runtime/environ.c \ -@@ -157,7 +159,7 @@ target_triplet = @target@ - - - # dummy sources for libtool --@onestep_TRUE@am__append_7 = libgfortran_c.c libgfortran_f.f90 -+@onestep_TRUE@am__append_8 = libgfortran_c.c libgfortran_f.f90 - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ -@@ -589,7 +591,7 @@ AMTAR = @AMTAR@ ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC 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 ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# . ++ ++LIB2ADD += $(srcdir)/config/i386/heap-trampoline.c ++HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.8 +diff --git a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath +new file mode 100644 +index 00000000000..e73d7f378b0 +--- /dev/null ++++ b/libgcc/config/t-darwin-rpath +@@ -0,0 +1,2 @@ ++# Use @rpath and add a search path to exes and dylibs that depend on this. ++SHLIB_RPATH = @rpath +diff --git a/libgcc/config/t-slibgcc-darwin b/libgcc/config/t-slibgcc-darwin +index cb0cbbdb1c5..da4886848e8 100644 +--- a/libgcc/config/t-slibgcc-darwin ++++ b/libgcc/config/t-slibgcc-darwin +@@ -1,4 +1,4 @@ +-# Build a shared libgcc library with the darwin linker. ++# Build a shared libgcc library able to use embedded runpaths. - # Some targets require additional compiler options for IEEE compatibility. - AM_CFLAGS = @AM_CFLAGS@ -fcx-fortran-rules $(SECTION_FLAGS) \ -- $(IEEE_FLAGS) $(am__append_1) -+ $(IEEE_FLAGS) $(am__append_2) - AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AM_FCFLAGS = @AM_FCFLAGS@ $(IEEE_FLAGS) - AR = @AR@ -@@ -748,6 +750,8 @@ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) - @LIBGFOR_USE_SYMVER_FALSE@version_dep = - @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.ver - @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.ver-sun gfortran.ver -+extra_darwin_ldflags_libgfortran = @extra_ldflags_libgfortran@ \ -+ $(am__append_1) - gfor_c_HEADERS = ISO_Fortran_binding.h - gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include - LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ -@@ -759,7 +763,7 @@ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) - libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ - $(HWCAP_LDFLAGS) \ -- $(LIBM) $(extra_ldflags_libgfortran) \ -+ $(LIBM) $(extra_darwin_ldflags_libgfortran) \ - $(version_arg) -Wc,-shared-libgcc + SHLIB_SOVERSION = 1.1 + SHLIB_SO_MINVERSION = 1 +@@ -6,7 +6,6 @@ SHLIB_VERSTRING = -compatibility_version $(SHLIB_SO_MINVERSION) \ + -current_version $(SHLIB_SOVERSION) + SHLIB_EXT = .dylib + SHLIB_LC = -lSystem +-SHLIB_INSTALL_DIR = $(slibdir) - libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) -@@ -780,7 +784,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ - -I$(MULTIBUILDTOP)../libbacktrace \ - -I../libbacktrace + SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk + SHLIB_MKMAP_OPTS = -v leading_underscore=1 +@@ -23,11 +22,16 @@ SHLIB_SONAME = @shlib_base_name@$(SHLIB_EXT) + # subdir. The code under MULTIBUILDTOP combines these into a single FAT + # library, that is what we eventually install. --gfor_io_src = io/size_from_kind.c $(am__append_2) -+gfor_io_src = io/size_from_kind.c $(am__append_3) - gfor_io_headers = \ - io/io.h \ - io/fbuf.h \ -@@ -802,7 +806,7 @@ gfor_helper_src = intrinsics/associated.c intrinsics/abort.c \ - intrinsics/selected_int_kind.f90 \ - intrinsics/selected_real_kind.f90 intrinsics/trigd.c \ - intrinsics/unpack_generic.c runtime/in_pack_generic.c \ -- runtime/in_unpack_generic.c $(am__append_3) $(am__append_4) -+ runtime/in_unpack_generic.c $(am__append_4) $(am__append_5) - @IEEE_SUPPORT_TRUE@gfor_ieee_helper_src = ieee/ieee_helper.c - @IEEE_SUPPORT_FALSE@gfor_ieee_src = - @IEEE_SUPPORT_TRUE@gfor_ieee_src = \ -@@ -811,8 +815,8 @@ gfor_helper_src = intrinsics/associated.c intrinsics/abort.c \ - @IEEE_SUPPORT_TRUE@ieee/ieee_features.F90 ++# When enable_darwin_at_rpath is true, use @rpath instead of $(slibdir) for ++# this and dylibs that depend on this. So this def must come first and be ++# overridden in a make fragment that depends on the rpath setting. ++SHLIB_RPATH = $(slibdir) ++ + SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \ +- -install_name $(SHLIB_INSTALL_DIR)/$(SHLIB_INSTALL_NAME) \ ++ -install_name $(SHLIB_RPATH)/$(SHLIB_INSTALL_NAME) \ + -single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME) \ + -Wl,-exported_symbols_list,$(SHLIB_MAP) \ +- $(SHLIB_VERSTRING) \ ++ $(SHLIB_VERSTRING) -nodefaultrpaths \ + @multilib_flags@ @shlib_objs@ $(SHLIB_LC) - gfor_src = runtime/bounds.c runtime/compile_options.c runtime/memory.c \ -- runtime/string.c runtime/select.c $(am__append_5) \ -- $(am__append_6) -+ runtime/string.c runtime/select.c $(am__append_6) \ -+ $(am__append_7) - i_all_c = \ - $(srcdir)/generated/all_l1.c \ - $(srcdir)/generated/all_l2.c \ -@@ -1652,7 +1656,7 @@ intrinsics/random_init.f90 + # we do our own thing +@@ -63,9 +67,9 @@ EHS_INSTNAME = libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT) + libgcc_ehs$(SHLIB_EXT): $(LIBEHSOBJS) $(extra-parts) + mkdir -p $(MULTIDIR) + $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \ +- -install_name $(SHLIB_INSTALL_DIR)/$(EHS_INSTNAME) \ ++ -install_name $(SHLIB_RPATH)/$(EHS_INSTNAME) \ + -o $(MULTIDIR)/libgcc_ehs$(SHLIB_EXT) $(SHLIB_VERSTRING) \ +- $(LIBEHSOBJS) $(SHLIB_LC) ++ -nodefaultrpaths $(LIBEHSOBJS) $(SHLIB_LC) - BUILT_SOURCES = $(gfor_built_src) $(gfor_built_specific_src) \ - $(gfor_built_specific2_src) $(gfor_misc_specifics) \ -- $(am__append_7) -+ $(am__append_8) - prereq_SRC = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \ - $(gfor_helper_src) $(gfor_ieee_src) $(gfor_io_headers) $(gfor_specific_src) + all: libgcc_ehs$(SHLIB_EXT) -diff --git a/libgfortran/configure b/libgfortran/configure -index ae64dca3114..f288af81ff5 100755 ---- a/libgfortran/configure -+++ b/libgfortran/configure -@@ -655,6 +655,8 @@ extra_ldflags_libgfortran - ac_ct_FC - FCFLAGS - FC -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - enable_static +@@ -122,12 +126,12 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) \ + cp ../$${mlib}/libgcc/$${mlib}/libgcc_ehs$(SHLIB_EXT) \ + ./libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} || exit 1 ; \ + arch=`$(LIPO) -info libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} | sed -e 's/.*:\ //'` ; \ +- $(CC) -arch $${arch} -nodefaultlibs -dynamiclib \ ++ $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ + -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ + -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ + -Wl,-reexport_library,libgcc_ehs.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ +- -install_name $(SHLIB_INSTALL_DIR)/libgcc_s.1.dylib \ +- -compatibility_version 1 -current_version 1 ; \ ++ -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ ++ -compatibility_version 1 -current_version 1.1 ; \ + done + $(LIPO) -output libgcc_s.1$(SHLIB_EXT) -create libgcc_s.1$(SHLIB_EXT)_T* + rm libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* +@@ -141,13 +145,13 @@ libgcc_s.1.dylib: all-multi libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT) + cp ../$${mlib}/libgcc/$${mlib}/libgcc_s$(SHLIB_EXT) \ + ./libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} || exit 1 ; \ + arch=`$(LIPO) -info libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} | sed -e 's/.*:\ //'` ; \ +- $(CC) -arch $${arch} -nodefaultlibs -dynamiclib \ ++ $(CC) -arch $${arch} -nodefaultlibs -dynamiclib -nodefaultrpaths \ + -o libgcc_s.1$(SHLIB_EXT)_T_$${mlib} \ + -Wl,-reexport_library,libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T_$${mlib} \ + -lSystem \ + -Wl,-reexported_symbols_list,$(srcdir)/config/darwin-unwind.ver \ +- -install_name $(SHLIB_INSTALL_DIR)/libgcc_s.1.dylib \ +- -compatibility_version 1 -current_version 1 ; \ ++ -install_name $(SHLIB_RPATH)/libgcc_s.1.dylib \ ++ -compatibility_version 1 -current_version 1.1 ; \ + done + $(LIPO) -output libgcc_s.1$(SHLIB_EXT) -create libgcc_s.1$(SHLIB_EXT)_T* + rm libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)_T* +diff --git a/libgcc/configure b/libgcc/configure +index be5d45f1755..85fc0b08c82 100755 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -630,7 +630,6 @@ LIPO + AR + toolexeclibdir + toolexecdir +-enable_gcov + target_subdir + host_subdir + build_subdir +@@ -654,6 +653,8 @@ build_cpu + build + with_aix_soname + enable_vtable_verify ++enable_gcov ++off_stack_trampolines enable_shared - lt_host_flags -@@ -824,6 +826,7 @@ enable_static - with_pic - enable_fast_install - enable_libtool_lock -+enable_darwin_at_rpath + libgcc_topdir + target_alias +@@ -701,6 +702,8 @@ with_target_subdir + with_cross_host + with_ld + enable_shared ++enable_off_stack_trampolines ++enable_gcov + enable_vtable_verify + with_aix_soname + enable_version_specific_runtime_libs +@@ -708,7 +711,6 @@ with_toolexeclibdir + with_slibdir + enable_maintainer_mode + with_build_libsubdir +-enable_gcov enable_largefile - enable_libquadmath_support - with_gcc_major_version_only -@@ -1479,6 +1482,8 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -+ --enable-darwin-at-path install libraries with @rpath/library-name, requires -+ rpaths to be added to executables + enable_decimal_float + with_system_libunwind +@@ -1342,12 +1344,15 @@ Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-shared don't provide a shared libgcc ++ --enable-off-stack-trampolines ++ Specify whether to support generating off-stack trampolines ++ ++ --disable-gcov don't provide libgcov and related host tools + --enable-vtable-verify Enable vtable verification feature + --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer +- --disable-gcov don't provide libgcov and related host tools --disable-largefile omit support for large files - --disable-libquadmath-support - disable libquadmath support for Fortran -@@ -10939,6 +10944,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) + --enable-decimal-float={no,yes,bid,dpd} + enable decimal float extension to C. Selecting 'bid' +@@ -2252,6 +2257,48 @@ fi -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi + ++# Check whether --enable-off-stack-trampolines was given. ++if test "${enable_off_stack_trampolines+set}" = set; then : ++ enableval=$enable_off_stack_trampolines; ++case "$target" in ++ x86_64-*-linux* | x86_64-*-darwin1[4-9]* | x86_64-*-darwin2*) ++ off_stack_trampolines=$enableval ++ ;; ++ aarch64*-*-linux* ) ++ off_stack_trampolines=$enableval ++ ;; ++ aarch64*-*darwin* ) ++ off_stack_trampolines=$enableval ++ ;; ++ *) ++ as_fn_error $? "Configure option --enable-off-stack-trampolines is not supported \ ++for this platform" "$LINENO" 5 ++ off_stack_trampolines=no ++ ;; ++esac +else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac + ++case "$target" in ++ *-*-darwin2*) ++ off_stack_trampolines=yes ++ ;; ++ *) ++ off_stack_trampolines=no ++ ;; ++esac +fi + + - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes -@@ -10956,10 +11002,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - - else - ld_shlibs=no -@@ -12766,7 +12821,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12769 "configure" -+#line 12824 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12872,7 +12927,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12875 "configure" -+#line 12930 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -13274,6 +13329,14 @@ esac - - - -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' ++ ++# Check whether --enable-gcov was given. ++if test "${enable_gcov+set}" = set; then : ++ enableval=$enable_gcov; +else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= ++ enable_gcov=yes +fi + - #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 - - # We need gfortran to compile parts of the library -@@ -14917,6 +14980,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) - - -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; + -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. + -+ esac + # Check whether --enable-vtable-verify was given. + if test "${enable_vtable_verify+set}" = set; then : + enableval=$enable_vtable_verify; case "$enableval" in +diff --git a/libgcc/configure.ac b/libgcc/configure.ac +index 2fc9d5d7c93..7d11bf00142 100644 +--- a/libgcc/configure.ac ++++ b/libgcc/configure.ac +@@ -68,6 +68,40 @@ AC_ARG_ENABLE(shared, + ], [enable_shared=yes]) + AC_SUBST(enable_shared) + ++AC_ARG_ENABLE([off-stack-trampolines], ++ [AS_HELP_STRING([--enable-off-stack-trampolines] ++ [Specify whether to support generating off-stack trampolines])],[ ++case "$target" in ++ x86_64-*-linux* | x86_64-*-darwin1[[4-9]]* | x86_64-*-darwin2*) ++ off_stack_trampolines=$enableval ++ ;; ++ aarch64*-*-linux* ) ++ off_stack_trampolines=$enableval ++ ;; ++ aarch64*-*darwin* ) ++ off_stack_trampolines=$enableval ++ ;; ++ *) ++ AC_MSG_ERROR([Configure option --enable-off-stack-trampolines is not supported \ ++for this platform]) ++ off_stack_trampolines=no ++ ;; ++esac],[ ++case "$target" in ++ *-*-darwin2*) ++ off_stack_trampolines=yes ++ ;; ++ *) ++ off_stack_trampolines=no ++ ;; ++esac]) ++AC_SUBST(off_stack_trampolines) + -+fi ++AC_ARG_ENABLE(gcov, ++[ --disable-gcov don't provide libgcov and related host tools], ++[], [enable_gcov=yes]) ++AC_SUBST(enable_gcov) + + AC_ARG_ENABLE(vtable-verify, + [ --enable-vtable-verify Enable vtable verification feature ], + [case "$enableval" in +diff --git a/libgcc/libgcc-std.ver.in b/libgcc/libgcc-std.ver.in +index c4f87a50e70..a48f4899eb6 100644 +--- a/libgcc/libgcc-std.ver.in ++++ b/libgcc/libgcc-std.ver.in +@@ -1943,4 +1943,7 @@ GCC_4.8.0 { + GCC_7.0.0 { + __PFX__divmoddi4 + __PFX__divmodti4 + - archive_cmds_need_lc_FC=no - hardcode_direct_FC=no - hardcode_automatic_FC=yes -@@ -14934,10 +15038,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - - else - ld_shlibs_FC=no -@@ -16190,9 +16303,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - # extra LD Flags which are required for targets -+extra_ldflags_libgfortran= - case "${host}" in -- *-darwin*) -- # Darwin needs -single_module when linking libgfortran -+ *-*-darwin[4567]*) -+ # Earlier Darwin needs -single_module when linking libgfortran - extra_ldflags_libgfortran=-Wl,-single_module - ;; - esac -@@ -28519,6 +28633,10 @@ if test -z "${HAVE_HWCAP_TRUE}" && test -z "${HAVE_HWCAP_FALSE}"; then - as_fn_error $? "conditional \"HAVE_HWCAP\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${LIBGFOR_BUILD_QUAD_TRUE}" && test -z "${LIBGFOR_BUILD_QUAD_FALSE}"; then - as_fn_error $? "conditional \"LIBGFOR_BUILD_QUAD\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac -index 97cc490cb5e..a21f56648a2 100644 ---- a/libgfortran/configure.ac -+++ b/libgfortran/configure.ac -@@ -282,6 +282,7 @@ LT_LIB_M - ACX_LT_HOST_FLAGS - AC_SUBST(enable_shared) - AC_SUBST(enable_static) -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) - #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 ++ __builtin_nested_func_ptr_created ++ __builtin_nested_func_ptr_deleted + } +diff --git a/libgcc/libgcc2.h b/libgcc/libgcc2.h +index 3ec9bbd8164..ac7eaab4f01 100644 +--- a/libgcc/libgcc2.h ++++ b/libgcc/libgcc2.h +@@ -29,6 +29,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #pragma GCC visibility push(default) + #endif - # We need gfortran to compile parts of the library -@@ -290,9 +291,10 @@ FC="$GFORTRAN" - AC_PROG_FC(gfortran) ++extern void __builtin_nested_func_ptr_created (void *, void *, void **); ++extern void __builtin_nested_func_ptr_deleted (void); ++ + extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t); + extern void __clear_cache (void *, void *); + extern void __eprintf (const char *, const char *, unsigned int, const char *) +diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am +index 454ad12e701..2bc2e57919d 100644 +--- a/libgfortran/Makefile.am ++++ b/libgfortran/Makefile.am +@@ -37,6 +37,11 @@ else + version_arg = + version_dep = + endif ++extra_darwin_ldflags_libgfortran = @extra_ldflags_libgfortran@ ++if ENABLE_DARWIN_AT_RPATH ++extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths ++extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path ++endif - # extra LD Flags which are required for targets -+extra_ldflags_libgfortran= - case "${host}" in -- *-darwin*) -- # Darwin needs -single_module when linking libgfortran -+ *-*-darwin[[4567]]*) -+ # Earlier Darwin needs -single_module when linking libgfortran - extra_ldflags_libgfortran=-Wl,-single_module - ;; - esac -diff --git a/libgo/configure b/libgo/configure -index ffe17c9be55..de5c1ac9b3d 100755 ---- a/libgo/configure -+++ b/libgo/configure -@@ -708,6 +708,8 @@ glibgo_toolexecdir - WERROR - WARN_FLAGS - CC_FOR_BUILD -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - enable_static - enable_shared - CPP -@@ -11544,7 +11546,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11547 "configure" -+#line 11549 "configure" - #include "confdefs.h" + gfor_c_HEADERS = ISO_Fortran_binding.h + gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include +@@ -50,7 +55,7 @@ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) + libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ + $(HWCAP_LDFLAGS) \ +- $(LIBM) $(extra_ldflags_libgfortran) \ ++ $(LIBM) $(extra_darwin_ldflags_libgfortran) \ + $(version_arg) -Wc,-shared-libgcc + libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) - #if HAVE_DLFCN_H -@@ -11650,7 +11652,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11653 "configure" -+#line 11655 "configure" - #include "confdefs.h" +diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in +index 23df0761096..ed0d05f502a 100644 +--- a/libgfortran/Makefile.in ++++ b/libgfortran/Makefile.in +@@ -91,8 +91,10 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-@LIBGFOR_MINIMAL_TRUE@am__append_1 = -DLIBGFOR_MINIMAL +-@LIBGFOR_MINIMAL_FALSE@am__append_2 = \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -Wc,-nodefaultrpaths \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path ++@LIBGFOR_MINIMAL_TRUE@am__append_2 = -DLIBGFOR_MINIMAL ++@LIBGFOR_MINIMAL_FALSE@am__append_3 = \ + @LIBGFOR_MINIMAL_FALSE@io/close.c \ + @LIBGFOR_MINIMAL_FALSE@io/file_pos.c \ + @LIBGFOR_MINIMAL_FALSE@io/format.c \ +@@ -110,7 +112,7 @@ target_triplet = @target@ + @LIBGFOR_MINIMAL_FALSE@io/fbuf.c \ + @LIBGFOR_MINIMAL_FALSE@io/async.c - #if HAVE_DLFCN_H -@@ -13779,6 +13781,14 @@ CC="$lt_save_CC" +-@LIBGFOR_MINIMAL_FALSE@am__append_3 = \ ++@LIBGFOR_MINIMAL_FALSE@am__append_4 = \ + @LIBGFOR_MINIMAL_FALSE@intrinsics/access.c \ + @LIBGFOR_MINIMAL_FALSE@intrinsics/c99_functions.c \ + @LIBGFOR_MINIMAL_FALSE@intrinsics/chdir.c \ +@@ -143,9 +145,9 @@ target_triplet = @target@ + @LIBGFOR_MINIMAL_FALSE@intrinsics/umask.c \ + @LIBGFOR_MINIMAL_FALSE@intrinsics/unlink.c +-@IEEE_SUPPORT_TRUE@am__append_4 = ieee/ieee_helper.c +-@LIBGFOR_MINIMAL_TRUE@am__append_5 = runtime/minimal.c +-@LIBGFOR_MINIMAL_FALSE@am__append_6 = \ ++@IEEE_SUPPORT_TRUE@am__append_5 = ieee/ieee_helper.c ++@LIBGFOR_MINIMAL_TRUE@am__append_6 = runtime/minimal.c ++@LIBGFOR_MINIMAL_FALSE@am__append_7 = \ + @LIBGFOR_MINIMAL_FALSE@runtime/backtrace.c \ + @LIBGFOR_MINIMAL_FALSE@runtime/convert_char.c \ + @LIBGFOR_MINIMAL_FALSE@runtime/environ.c \ +@@ -157,7 +159,7 @@ target_triplet = @target@ -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' -+else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= -+fi -+ + # dummy sources for libtool +-@onestep_TRUE@am__append_7 = libgfortran_c.c libgfortran_f.f90 ++@onestep_TRUE@am__append_8 = libgfortran_c.c libgfortran_f.f90 + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +@@ -589,7 +591,7 @@ AMTAR = @AMTAR@ - CC_FOR_BUILD=${CC_FOR_BUILD:-gcc} + # Some targets require additional compiler options for IEEE compatibility. + AM_CFLAGS = @AM_CFLAGS@ -fcx-fortran-rules $(SECTION_FLAGS) \ +- $(IEEE_FLAGS) $(am__append_1) ++ $(IEEE_FLAGS) $(am__append_2) + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_FCFLAGS = @AM_FCFLAGS@ $(IEEE_FLAGS) + AR = @AR@ +@@ -749,6 +751,8 @@ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) + @LIBGFOR_USE_SYMVER_FALSE@version_dep = + @LIBGFOR_USE_SYMVER_GNU_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.ver + @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@version_dep = gfortran.ver-sun gfortran.ver ++extra_darwin_ldflags_libgfortran = @extra_ldflags_libgfortran@ \ ++ $(am__append_1) + gfor_c_HEADERS = ISO_Fortran_binding.h + gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ +@@ -760,7 +764,7 @@ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) + libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ + $(HWCAP_LDFLAGS) \ +- $(LIBM) $(extra_ldflags_libgfortran) \ ++ $(LIBM) $(extra_darwin_ldflags_libgfortran) \ + $(version_arg) -Wc,-shared-libgcc -@@ -16321,6 +16331,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${USE_LIBFFI_TRUE}" && test -z "${USE_LIBFFI_FALSE}"; then - as_fn_error $? "conditional \"USE_LIBFFI\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libgo/configure.ac b/libgo/configure.ac -index 7e2b98ba67c..7b0222bb620 100644 ---- a/libgo/configure.ac -+++ b/libgo/configure.ac -@@ -53,6 +53,7 @@ AC_LIBTOOL_DLOPEN - AM_PROG_LIBTOOL - AC_SUBST(enable_shared) - AC_SUBST(enable_static) -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) +@@ -781,7 +785,7 @@ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ + -I$(MULTIBUILDTOP)../libbacktrace \ + -I../libbacktrace - CC_FOR_BUILD=${CC_FOR_BUILD:-gcc} - AC_SUBST(CC_FOR_BUILD) -diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am -index f8b2a06d63e..81ba6c634fa 100644 ---- a/libgomp/Makefile.am -+++ b/libgomp/Makefile.am -@@ -53,9 +53,14 @@ else - libgomp_version_script = - libgomp_version_dep = - endif -+ - libgomp_version_info = -version-info $(libtool_VERSION) -+if ENABLE_DARWIN_AT_RPATH -+libgomp_darwin_rpath = -Wc,-nodefaultrpaths -+libgomp_darwin_rpath += -Wl,-rpath,@loader_path -+endif - libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ -- $(lt_host_flags) -+ $(lt_host_flags) $(libgomp_darwin_rpath) - libgomp_la_DEPENDENCIES = $(libgomp_version_dep) - libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS) +-gfor_io_src = io/size_from_kind.c $(am__append_2) ++gfor_io_src = io/size_from_kind.c $(am__append_3) + gfor_io_headers = \ + io/io.h \ + io/fbuf.h \ +@@ -803,7 +807,7 @@ gfor_helper_src = intrinsics/associated.c intrinsics/abort.c \ + intrinsics/selected_int_kind.f90 \ + intrinsics/selected_real_kind.f90 intrinsics/trigd.c \ + intrinsics/unpack_generic.c runtime/in_pack_generic.c \ +- runtime/in_unpack_generic.c $(am__append_3) $(am__append_4) ++ runtime/in_unpack_generic.c $(am__append_4) $(am__append_5) + @IEEE_SUPPORT_TRUE@gfor_ieee_helper_src = ieee/ieee_helper.c + @IEEE_SUPPORT_FALSE@gfor_ieee_src = + @IEEE_SUPPORT_TRUE@gfor_ieee_src = \ +@@ -812,8 +816,8 @@ gfor_helper_src = intrinsics/associated.c intrinsics/abort.c \ + @IEEE_SUPPORT_TRUE@ieee/ieee_features.F90 -diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in -index 6f0cb716135..5cfb149c2ba 100644 ---- a/libgomp/Makefile.in -+++ b/libgomp/Makefile.in -@@ -546,8 +546,11 @@ nodist_toolexeclib_HEADERS = libgomp.spec - @LIBGOMP_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE@libgomp_version_dep = libgomp.ver - @LIBGOMP_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE@libgomp_version_dep = libgomp.ver-sun - libgomp_version_info = -version-info $(libtool_VERSION) -+@ENABLE_DARWIN_AT_RPATH_TRUE@libgomp_darwin_rpath = \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path - libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ -- $(lt_host_flags) -+ $(lt_host_flags) $(libgomp_darwin_rpath) + gfor_src = runtime/bounds.c runtime/compile_options.c runtime/memory.c \ +- runtime/string.c runtime/select.c $(am__append_5) \ +- $(am__append_6) ++ runtime/string.c runtime/select.c $(am__append_6) \ ++ $(am__append_7) + i_all_c = \ + $(srcdir)/generated/all_l1.c \ + $(srcdir)/generated/all_l2.c \ +@@ -1653,7 +1657,7 @@ intrinsics/random_init.f90 - libgomp_la_DEPENDENCIES = $(libgomp_version_dep) - libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS) -diff --git a/libgomp/configure b/libgomp/configure -index 85fdb4d3f48..71b5987dc9a 100755 ---- a/libgomp/configure -+++ b/libgomp/configure -@@ -692,6 +692,8 @@ FC - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE + BUILT_SOURCES = $(gfor_built_src) $(gfor_built_specific_src) \ + $(gfor_built_specific2_src) $(gfor_misc_specifics) \ +- $(am__append_7) ++ $(am__append_8) + prereq_SRC = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \ + $(gfor_helper_src) $(gfor_ieee_src) $(gfor_io_headers) $(gfor_specific_src) + +diff --git a/libgfortran/configure b/libgfortran/configure +index d7c3a5e27a0..57a2c9d4946 100755 +--- a/libgfortran/configure ++++ b/libgfortran/configure +@@ -654,6 +654,8 @@ extra_ldflags_libgfortran + ac_ct_FC + FCFLAGS + FC +ENABLE_DARWIN_AT_RPATH_FALSE +ENABLE_DARWIN_AT_RPATH_TRUE enable_static enable_shared lt_host_flags -@@ -832,6 +834,7 @@ with_pic +@@ -823,6 +825,7 @@ enable_static + with_pic enable_fast_install - with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath - enable_maintainer_mode - with_cuda_driver - with_cuda_driver_include -@@ -1493,6 +1496,8 @@ Optional Features: + enable_largefile + enable_libquadmath_support + with_gcc_major_version_only +@@ -1478,6 +1481,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer -@@ -9625,6 +9630,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + --disable-largefile omit support for large files + --disable-libquadmath-support + disable libquadmath support for Fortran +@@ -9235,7 +9240,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10945,6 +10950,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -10202,8 +7515,9 @@ index 85fdb4d3f48..71b5987dc9a 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -10211,15 +7525,16 @@ index 85fdb4d3f48..71b5987dc9a 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -10233,49 +7548,41 @@ index 85fdb4d3f48..71b5987dc9a 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9642,10 +9688,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10962,9 +11010,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -11431,7 +11486,7 @@ else +@@ -12791,7 +12843,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11434 "configure" -+#line 11489 "configure" +-#line 12794 "configure" ++#line 12846 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11537,7 +11592,7 @@ else +@@ -12897,7 +12949,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11540 "configure" -+#line 11595 "configure" +-#line 12900 "configure" ++#line 12952 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11798,6 +11853,14 @@ esac +@@ -13299,6 +13351,14 @@ esac @@ -10287,10 +7594,10 @@ index 85fdb4d3f48..71b5987dc9a 100755 + ENABLE_DARWIN_AT_RPATH_FALSE= +fi + + #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -@@ -13473,6 +13536,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # We need gfortran to compile parts of the library +@@ -14942,6 +15002,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -10307,8 +7614,9 @@ index 85fdb4d3f48..71b5987dc9a 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -10316,15 +7624,16 @@ index 85fdb4d3f48..71b5987dc9a 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -10338,332 +7647,181 @@ index 85fdb4d3f48..71b5987dc9a 100755 archive_cmds_need_lc_FC=no hardcode_direct_FC=no hardcode_automatic_FC=yes -@@ -13490,10 +13594,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -14959,9 +15062,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs_FC=no -@@ -17213,6 +17326,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then - as_fn_error $? "conditional \"BUILD_INFO\" was never defined. +@@ -16234,9 +16341,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # extra LD Flags which are required for targets ++extra_ldflags_libgfortran= + case "${host}" in +- *-darwin*) +- # Darwin needs -single_module when linking libgfortran ++ *-*-darwin[4567]*) ++ # Earlier Darwin needs -single_module when linking libgfortran + extra_ldflags_libgfortran=-Wl,-single_module + ;; + esac +@@ -31597,6 +31705,10 @@ if test -z "${HAVE_HWCAP_TRUE}" && test -z "${HAVE_HWCAP_FALSE}"; then + as_fn_error $? "conditional \"HAVE_HWCAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + if test -z "${IEEE_SUPPORT_TRUE}" && test -z "${IEEE_SUPPORT_FALSE}"; then + as_fn_error $? "conditional \"IEEE_SUPPORT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libgomp/configure.ac b/libgomp/configure.ac -index a9b1f3973f7..654fca1f445 100644 ---- a/libgomp/configure.ac -+++ b/libgomp/configure.ac -@@ -149,6 +149,7 @@ AM_PROG_LIBTOOL +diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac +index 07b9a48a19f..4ee63cf723e 100644 +--- a/libgfortran/configure.ac ++++ b/libgfortran/configure.ac +@@ -282,6 +282,7 @@ LT_LIB_M ACX_LT_HOST_FLAGS AC_SUBST(enable_shared) AC_SUBST(enable_static) +AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 - AM_MAINTAINER_MODE - -diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4 -index 3378316dced..1a00b771fe1 100644 ---- a/libiberty/aclocal.m4 -+++ b/libiberty/aclocal.m4 -@@ -12,10 +12,61 @@ - # PARTICULAR PURPOSE. - - m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright (C) 1997-2017 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ([2.52])dnl -+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+m4_define([_AM_COND_VALUE_$1], [$2])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) -+ -+# Copyright (C) 2006-2017 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ -+# AM_SUBST_NOTMAKE(VARIABLE) -+# -------------------------- -+# Public sister of _AM_SUBST_NOTMAKE. -+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -+ - m4_include([../config/acx.m4]) - m4_include([../config/cet.m4]) - m4_include([../config/enable.m4]) - m4_include([../config/no-executables.m4]) -+m4_include([../config/override.m4]) - m4_include([../config/picflag.m4]) - m4_include([../config/warnings.m4]) - m4_include([acinclude.m4]) -diff --git a/libiberty/configure b/libiberty/configure -index 0a797255c70..a346be40cc2 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -632,6 +632,8 @@ PICFLAG - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE - OUTPUT_OPTION - NO_MINUS_C_MINUS_O - ac_libiberty_warn_cflags -@@ -2459,6 +2461,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -+ -+ -+ - # This works around the fact that libtool configuration may change LD - # for this particular configuration, but some shells, instead of - # keeping the changes in LD private, export them just because LD is -@@ -5046,6 +5051,15 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - - - -+ if test x$enable_darwin_at_rpath = xyes; then -+ ENABLE_DARWIN_AT_RPATH_TRUE= -+ ENABLE_DARWIN_AT_RPATH_FALSE='#' -+else -+ ENABLE_DARWIN_AT_RPATH_TRUE='#' -+ ENABLE_DARWIN_AT_RPATH_FALSE= -+fi -+ -+ - ac_config_headers="$ac_config_headers config.h:config.in" - - -@@ -5208,6 +5222,9 @@ case "${host}" in - # sets the default TLS model and affects inlining. - PICFLAG=-fPIC - ;; -+ loongarch*-*-*) -+ PICFLAG=-fpic -+ ;; - mips-sgi-irix6*) - # PIC is the default. - ;; -@@ -7837,6 +7854,10 @@ LTLIBOBJS=$ac_ltlibobjs - - - -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - - : "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index 84a7b378fad..4dad84ea77a 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -190,6 +190,8 @@ dnl AM_DISABLE_SHARED - dnl When we start using libtool: - dnl AM_PROG_LIBTOOL - -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) -+ - dnl When we start using automake: - dnl AM_CONFIG_HEADER(config.h:config.in) - AC_CONFIG_HEADER(config.h:config.in) -diff --git a/libitm/Makefile.am b/libitm/Makefile.am -index 3f31ad30556..a25317b07fe 100644 ---- a/libitm/Makefile.am -+++ b/libitm/Makefile.am -@@ -54,7 +54,12 @@ libitm_version_info = -version-info $(libtool_VERSION) - # want or need libstdc++. - libitm_la_DEPENDENCIES = $(libitm_version_dep) - libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS) --libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) -+if ENABLE_DARWIN_AT_RPATH -+libitm_darwin_rpath = -Wc,-nodefaultrpaths -+libitm_darwin_rpath += -Wl,-rpath,@loader_path -+endif -+libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) \ -+ $(libitm_darwin_rpath) - - libitm_la_SOURCES = \ - aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \ -diff --git a/libitm/Makefile.in b/libitm/Makefile.in -index 7f53ea9b9db..ed28db45057 100644 ---- a/libitm/Makefile.in -+++ b/libitm/Makefile.in -@@ -481,7 +481,12 @@ libitm_version_info = -version-info $(libtool_VERSION) - # want or need libstdc++. - libitm_la_DEPENDENCIES = $(libitm_version_dep) - libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS) --libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) -+@ENABLE_DARWIN_AT_RPATH_TRUE@libitm_darwin_rpath = \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ -+@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path -+libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) \ -+ $(libitm_darwin_rpath) -+ - libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \ - barrier.cc beginend.cc clone.cc eh_cpp.cc local.cc query.cc \ - retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \ -diff --git a/libitm/config/aarch64/sjlj.S b/libitm/config/aarch64/sjlj.S -index 296cb683a9f..941e886143e 100644 ---- a/libitm/config/aarch64/sjlj.S -+++ b/libitm/config/aarch64/sjlj.S -@@ -57,10 +57,19 @@ - - .text - .align 2 -+#if __ELF__ - .global _ITM_beginTransaction - .type _ITM_beginTransaction, %function - - _ITM_beginTransaction: -+ -+#elif __MACH__ -+ .global __ITM_beginTransaction -+ -+__ITM_beginTransaction: -+ -+#endif -+ - cfi_startproc - CFI_PAC_KEY - PAC_AND_BTI -@@ -84,8 +93,13 @@ _ITM_beginTransaction: - - /* Invoke GTM_begin_transaction with the struct we just built. */ - mov x1, sp -+#if __ELF__ - bl GTM_begin_transaction -- -+#elif __MACH__ -+ bl _GTM_begin_transaction -+#else -+#error "unexpected object format" -+#endif - /* Return; we don't need to restore any of the call-saved regs. */ - ldp x29, x30, [sp], 11*16 - cfi_adjust_cfa_offset(-11*16) -@@ -95,14 +109,23 @@ _ITM_beginTransaction: - CFI_PAC_TOGGLE - ret - cfi_endproc -+#if __ELF__ - .size _ITM_beginTransaction, . - _ITM_beginTransaction -+#endif + # We need gfortran to compile parts of the library +@@ -290,9 +291,10 @@ FC="$GFORTRAN" + AC_PROG_FC(gfortran) - .align 2 -+#if __ELF__ - .global GTM_longjmp - .hidden GTM_longjmp - .type GTM_longjmp, %function + # extra LD Flags which are required for targets ++extra_ldflags_libgfortran= + case "${host}" in +- *-darwin*) +- # Darwin needs -single_module when linking libgfortran ++ *-*-darwin[[4567]]*) ++ # Earlier Darwin needs -single_module when linking libgfortran + extra_ldflags_libgfortran=-Wl,-single_module + ;; + esac +diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am +index 95df3ed7a30..aa35e747c9a 100644 +--- a/libgm2/Makefile.am ++++ b/libgm2/Makefile.am +@@ -46,6 +46,12 @@ SUBDIRS = libm2min libm2log libm2cor libm2iso libm2pim + GM2_BUILDDIR := $(shell pwd) + gm2_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include - GTM_longjmp: -+ -+#elif __MACH__ -+ .private_extern _GTM_longjmp ++if ENABLE_DARWIN_AT_RPATH ++DARWIN_AT_RPATH=yes ++else ++DARWIN_AT_RPATH=yes ++endif + -+_GTM_longjmp: -+#endif - /* The first parameter becomes the return value (x0). - The third parameter is ignored for now. */ - cfi_startproc -@@ -126,7 +149,9 @@ GTM_longjmp: - CFI_PAC_TOGGLE - br x30 - cfi_endproc -+#if __ELF__ - .size GTM_longjmp, . - GTM_longjmp -+#endif + # Work around what appears to be a GNU make bug handling MAKEFLAGS + # values defined in terms of make variables, as is the case for CC and + # friends when we are called from the top level Makefile. +@@ -91,7 +97,8 @@ AM_MAKEFLAGS = \ + "WERROR=$(WERROR)" \ + "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ + "TARGET_LIB_PATH_libgm2=$(TARGET_LIB_PATH_libgm2)" \ +- "LIBTOOL=$(GM2_BUILDDIR)/libtool" ++ "LIBTOOL=$(GM2_BUILDDIR)/libtool" \ ++ "DARWIN_AT_RPATH=$(DARWIN_AT_RPATH)" + + # Subdir rules rely on $(FLAGS_TO_PASS) + FLAGS_TO_PASS = $(AM_MAKEFLAGS) +diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in +index d9950065de1..f97f6d0812d 100644 +--- a/libgm2/Makefile.in ++++ b/libgm2/Makefile.in +@@ -344,6 +344,8 @@ GM2_SRC = $(GCC_DIR)/m2 + SUBDIRS = libm2min libm2log libm2cor libm2iso libm2pim + GM2_BUILDDIR := $(shell pwd) + gm2_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include ++@ENABLE_DARWIN_AT_RPATH_FALSE@DARWIN_AT_RPATH = yes ++@ENABLE_DARWIN_AT_RPATH_TRUE@DARWIN_AT_RPATH = yes - /* GNU_PROPERTY_AARCH64_* macros from elf.h for use in asm code. */ - #define FEATURE_1_AND 0xc0000000 -diff --git a/libitm/configure b/libitm/configure -index 18fc2d3a10a..5beb48a6b99 100755 ---- a/libitm/configure -+++ b/libitm/configure -@@ -660,6 +660,8 @@ libtool_VERSION - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE -+ENABLE_DARWIN_AT_RPATH_FALSE -+ENABLE_DARWIN_AT_RPATH_TRUE + # Work around what appears to be a GNU make bug handling MAKEFLAGS + # values defined in terms of make variables, as is the case for CC and +@@ -390,7 +392,8 @@ AM_MAKEFLAGS = \ + "WERROR=$(WERROR)" \ + "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ + "TARGET_LIB_PATH_libgm2=$(TARGET_LIB_PATH_libgm2)" \ +- "LIBTOOL=$(GM2_BUILDDIR)/libtool" ++ "LIBTOOL=$(GM2_BUILDDIR)/libtool" \ ++ "DARWIN_AT_RPATH=$(DARWIN_AT_RPATH)" + + + # Subdir rules rely on $(FLAGS_TO_PASS) +diff --git a/libgm2/configure b/libgm2/configure +index 8eb1bc81c66..d1a056a8a3b 100755 +--- a/libgm2/configure ++++ b/libgm2/configure +@@ -649,6 +649,8 @@ GM2_FOR_TARGET + CC_FOR_BUILD enable_static enable_shared ++ENABLE_DARWIN_AT_RPATH_FALSE ++ENABLE_DARWIN_AT_RPATH_TRUE CXXCPP -@@ -810,6 +812,7 @@ with_pic + OTOOL64 + OTOOL +@@ -806,6 +808,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath - enable_maintainer_mode - enable_linux_futex - enable_tls -@@ -1462,6 +1465,8 @@ Optional Features: + with_gcc_major_version_only + ' + ac_precious_vars='build_alias +@@ -1456,6 +1459,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer -@@ -10252,6 +10257,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -6575,10 +6580,6 @@ fi + + + +-enable_dlopen=yes +- +- +- + case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +@@ -9149,7 +9150,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9197,6 +9198,8 @@ done + + + ++ enable_dlopen=no ++ + + enable_win32_dll=no + +@@ -10860,6 +10863,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -10680,8 +7838,9 @@ index 18fc2d3a10a..5beb48a6b99 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -10689,15 +7848,16 @@ index 18fc2d3a10a..5beb48a6b99 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -10711,49 +7871,41 @@ index 18fc2d3a10a..5beb48a6b99 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -10269,10 +10315,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10877,9 +10923,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -12058,7 +12113,7 @@ else +@@ -12706,7 +12756,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12061 "configure" -+#line 12116 "configure" +-#line 12709 "configure" ++#line 12759 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12164,7 +12219,7 @@ else +@@ -12812,7 +12862,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12167 "configure" -+#line 12222 "configure" +-#line 12815 "configure" ++#line 12865 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13040,6 +13095,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13694,6 +13744,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -10770,8 +7922,9 @@ index 18fc2d3a10a..5beb48a6b99 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -10779,15 +7932,16 @@ index 18fc2d3a10a..5beb48a6b99 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -10801,41 +7955,39 @@ index 18fc2d3a10a..5beb48a6b99 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -13057,12 +13153,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13711,12 +13804,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -15414,6 +15523,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -16090,6 +16191,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ++enable_dlopen=yes ++ ++ ++ ++ + if test x$enable_darwin_at_rpath = xyes; then + ENABLE_DARWIN_AT_RPATH_TRUE= + ENABLE_DARWIN_AT_RPATH_FALSE='#' @@ -10843,149 +7995,384 @@ index 18fc2d3a10a..5beb48a6b99 100755 + ENABLE_DARWIN_AT_RPATH_TRUE='#' + ENABLE_DARWIN_AT_RPATH_FALSE= +fi ++ ++ + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -@@ -18172,6 +18289,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then - as_fn_error $? "conditional \"BUILD_INFO\" was never defined. + if test "${multilib}" = "yes"; then +@@ -19873,6 +19989,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + if test -z "${BUILD_PIMLIB_TRUE}" && test -z "${BUILD_PIMLIB_FALSE}"; then + as_fn_error $? "conditional \"BUILD_PIMLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/libitm/configure.ac b/libitm/configure.ac -index 78a682376d9..209a025a90e 100644 ---- a/libitm/configure.ac -+++ b/libitm/configure.ac -@@ -157,6 +157,7 @@ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") +diff --git a/libgm2/configure.ac b/libgm2/configure.ac +index 3a79d2612b6..e8c7ba711cd 100644 +--- a/libgm2/configure.ac ++++ b/libgm2/configure.ac +@@ -177,8 +177,12 @@ AC_PATH_PROG(PERL, perl, perl-not-found-in-path-error) + AC_PROG_MAKE_SET + AC_PROG_INSTALL + +-AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL ++LT_INIT ++AC_LIBTOOL_DLOPEN ++ ++AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) ++ AC_SUBST(enable_shared) AC_SUBST(enable_static) -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) - AM_MAINTAINER_MODE +diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am +index 48de40c22dd..e50c7a2ef55 100644 +--- a/libgm2/libm2cor/Makefile.am ++++ b/libgm2/libm2cor/Makefile.am +@@ -123,6 +123,10 @@ libm2cor_la_link_flags = -Wl,-undefined,dynamic_lookup + else + libm2cor_la_link_flags = + endif ++if ENABLE_DARWIN_AT_RPATH ++libm2cor_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/ ++endif ++ + libm2cor_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2cor_la_link_flags) + BUILT_SOURCES = SYSTEM.def + CLEANFILES = SYSTEM.def +diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in +index 9d643d5f8f6..d92c956aae6 100644 +--- a/libgm2/libm2cor/Makefile.in ++++ b/libgm2/libm2cor/Makefile.in +@@ -105,6 +105,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++@BUILD_CORLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths -Wl,-rpath,@loader_path/ + subdir = libm2cor + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -469,8 +470,10 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + @BUILD_CORLIB_TRUE@ -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \ + @BUILD_CORLIB_TRUE@ -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2cor + +-@BUILD_CORLIB_TRUE@@TARGET_DARWIN_FALSE@libm2cor_la_link_flags = +-@BUILD_CORLIB_TRUE@@TARGET_DARWIN_TRUE@libm2cor_la_link_flags = -Wl,-undefined,dynamic_lookup ++@BUILD_CORLIB_TRUE@@TARGET_DARWIN_FALSE@libm2cor_la_link_flags = \ ++@BUILD_CORLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1) ++@BUILD_CORLIB_TRUE@@TARGET_DARWIN_TRUE@libm2cor_la_link_flags = -Wl,-undefined,dynamic_lookup \ ++@BUILD_CORLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1) + @BUILD_CORLIB_TRUE@libm2cor_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2cor_la_link_flags) + @BUILD_CORLIB_TRUE@BUILT_SOURCES = SYSTEM.def + @BUILD_CORLIB_TRUE@CLEANFILES = SYSTEM.def +diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am +index d48ef0692ab..b0c4a5f965e 100644 +--- a/libgm2/libm2iso/Makefile.am ++++ b/libgm2/libm2iso/Makefile.am +@@ -195,6 +195,10 @@ libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup + else + libm2iso_la_link_flags = + endif ++if ENABLE_DARWIN_AT_RPATH ++libm2iso_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/ ++endif ++ + libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags) + CLEANFILES = SYSTEM.def + BUILT_SOURCES = SYSTEM.def +diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in +index b8936e745fe..7c7e181a01e 100644 +--- a/libgm2/libm2iso/Makefile.in ++++ b/libgm2/libm2iso/Makefile.in +@@ -105,6 +105,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++@BUILD_ISOLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths -Wl,-rpath,@loader_path/ + subdir = libm2iso + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -568,8 +569,10 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + @BUILD_ISOLIB_TRUE@ -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs \ + @BUILD_ISOLIB_TRUE@ -fiso -fextended-opaque -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2iso + +-@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_FALSE@libm2iso_la_link_flags = +-@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup ++@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_FALSE@libm2iso_la_link_flags = \ ++@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1) ++@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup \ ++@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1) + @BUILD_ISOLIB_TRUE@libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags) + @BUILD_ISOLIB_TRUE@CLEANFILES = SYSTEM.def + @BUILD_ISOLIB_TRUE@BUILT_SOURCES = SYSTEM.def +diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am +index a15747fd245..3b7609ee5c1 100644 +--- a/libgm2/libm2log/Makefile.am ++++ b/libgm2/libm2log/Makefile.am +@@ -142,6 +142,9 @@ libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup + else + libm2log_la_link_flags = + endif ++if ENABLE_DARWIN_AT_RPATH ++libm2log_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/ ++endif + libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags) + BUILT_SOURCES = ../libm2pim/SYSTEM.def + +diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in +index fa98b1d8ff1..cf48c2bb74f 100644 +--- a/libgm2/libm2log/Makefile.in ++++ b/libgm2/libm2log/Makefile.in +@@ -105,6 +105,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++@BUILD_LOGLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths -Wl,-rpath,@loader_path/ + subdir = libm2log + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -478,8 +479,10 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + @BUILD_LOGLIB_TRUE@ -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \ + @BUILD_LOGLIB_TRUE@ -Wreturn-type -fcase -fm2-prefix=m2log + +-@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@libm2log_la_link_flags = +-@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup ++@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@libm2log_la_link_flags = \ ++@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1) ++@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup \ ++@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1) + @BUILD_LOGLIB_TRUE@libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags) + @BUILD_LOGLIB_TRUE@BUILT_SOURCES = ../libm2pim/SYSTEM.def + @BUILD_LOGLIB_TRUE@M2LIBDIR = /m2/m2log/ +diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am +index 1ff160028f6..21411769505 100644 +--- a/libgm2/libm2min/Makefile.am ++++ b/libgm2/libm2min/Makefile.am +@@ -113,6 +113,9 @@ libm2min_la_link_flags = -Wl,-undefined,dynamic_lookup + else + libm2min_la_link_flags = + endif ++if ENABLE_DARWIN_AT_RPATH ++libm2min_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/ ++endif + libm2min_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2min_la_link_flags) + BUILT_SOURCES = SYSTEM.def + CLEANFILES = SYSTEM.def +diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in +index 1c0bebdc304..ed3312deb0f 100644 +--- a/libgm2/libm2min/Makefile.in ++++ b/libgm2/libm2min/Makefile.in +@@ -105,6 +105,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths -Wl,-rpath,@loader_path/ + subdir = libm2min + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -442,8 +443,10 @@ libm2min_la_M2FLAGS = \ + -fm2-pathname=m2pim -I$(GM2_SRC)/gm2-libs -fno-exceptions \ + -fno-m2-plugin -fno-scaffold-dynamic -fno-scaffold-main -fm2-prefix=m2min + +-@TARGET_DARWIN_FALSE@libm2min_la_link_flags = +-@TARGET_DARWIN_TRUE@libm2min_la_link_flags = -Wl,-undefined,dynamic_lookup ++@TARGET_DARWIN_FALSE@libm2min_la_link_flags = $(am__append_1) ++@TARGET_DARWIN_TRUE@libm2min_la_link_flags = \ ++@TARGET_DARWIN_TRUE@ -Wl,-undefined,dynamic_lookup \ ++@TARGET_DARWIN_TRUE@ $(am__append_1) + libm2min_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2min_la_link_flags) + BUILT_SOURCES = SYSTEM.def + CLEANFILES = SYSTEM.def +diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am +index ebfeba1ac1d..e777a60c077 100644 +--- a/libgm2/libm2pim/Makefile.am ++++ b/libgm2/libm2pim/Makefile.am +@@ -175,6 +175,9 @@ libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup + else + libm2pim_la_link_flags = + endif ++if ENABLE_DARWIN_AT_RPATH ++libm2pim_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/ ++endif + libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags) + BUILT_SOURCES = SYSTEM.def + CLEANFILES = SYSTEM.def +diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in +index e5a97976d93..5e97a02a91d 100644 +--- a/libgm2/libm2pim/Makefile.in ++++ b/libgm2/libm2pim/Makefile.in +@@ -105,6 +105,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ ++@BUILD_PIMLIB_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@am__append_1 = -nodefaultrpaths -Wl,-rpath,@loader_path/ + subdir = libm2pim + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -539,8 +540,10 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) + @BUILD_PIMLIB_TRUE@ -fm2-pathname=m2iso -I$(GM2_SRC)/gm2-libs-iso \ + @BUILD_PIMLIB_TRUE@ -fm2-g -g -Wreturn-type -fcase -fm2-prefix=m2pim + +-@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_FALSE@libm2pim_la_link_flags = +-@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup ++@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_FALSE@libm2pim_la_link_flags = \ ++@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1) ++@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup \ ++@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1) + @BUILD_PIMLIB_TRUE@libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags) + @BUILD_PIMLIB_TRUE@BUILT_SOURCES = SYSTEM.def + @BUILD_PIMLIB_TRUE@CLEANFILES = SYSTEM.def +diff --git a/libgo/configure b/libgo/configure +index a607dbff68e..72d46c3eec3 100755 +--- a/libgo/configure ++++ b/libgo/configure +@@ -708,6 +708,8 @@ glibgo_toolexecdir + WERROR + WARN_FLAGS + CC_FOR_BUILD ++ENABLE_DARWIN_AT_RPATH_FALSE ++ENABLE_DARWIN_AT_RPATH_TRUE + enable_static + enable_shared + CPP +@@ -11544,7 +11546,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11547 "configure" ++#line 11549 "configure" + #include "confdefs.h" -diff --git a/libitm/configure.tgt b/libitm/configure.tgt -index 06e90973ef3..acaf4f85712 100644 ---- a/libitm/configure.tgt -+++ b/libitm/configure.tgt -@@ -50,7 +50,7 @@ fi - # Map the target cpu to an ARCH sub-directory. At the same time, - # work out any special compilation flags as necessary. - case "${target_cpu}" in -- aarch64*) ARCH=aarch64 ;; -+ aarch64* | arm64*) ARCH=aarch64 ;; - alpha*) ARCH=alpha ;; - rs6000 | powerpc*) - XCFLAGS="${XCFLAGS} -mhtm" -diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp -index 6d8e3e71310..906534022eb 100644 ---- a/libitm/testsuite/lib/libitm.exp -+++ b/libitm/testsuite/lib/libitm.exp -@@ -158,6 +158,7 @@ proc libitm_init { args } { - } + #if HAVE_DLFCN_H +@@ -11650,7 +11652,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11653 "configure" ++#line 11655 "configure" + #include "confdefs.h" - if [istarget *-*-darwin*] { -+ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" - lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc" - } + #if HAVE_DLFCN_H +@@ -13779,6 +13781,14 @@ CC="$lt_save_CC" -diff --git a/libitm/testsuite/libitm.c++/c++.exp b/libitm/testsuite/libitm.c++/c++.exp -index f92aa096104..295c5bd4703 100644 ---- a/libitm/testsuite/libitm.c++/c++.exp -+++ b/libitm/testsuite/libitm.c++/c++.exp -@@ -56,8 +56,10 @@ if { $lang_test_file_found } { - # Gather a list of all tests. - set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] -+ set stdcxxadder "" - if { $blddir != "" } { - set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" -+ set stdcxxadder "-B ${blddir}/${lang_library_path}" - } else { - set ld_library_path "$always_ld_library_path" - } -@@ -72,7 +74,7 @@ if { $lang_test_file_found } { - } - # Main loop. -- dg-runtest $tests "" $libstdcxx_includes -+ dg-runtest $tests $stdcxxadder $libstdcxx_includes - } ++ if test x$enable_darwin_at_rpath = xyes; then ++ ENABLE_DARWIN_AT_RPATH_TRUE= ++ ENABLE_DARWIN_AT_RPATH_FALSE='#' ++else ++ ENABLE_DARWIN_AT_RPATH_TRUE='#' ++ ENABLE_DARWIN_AT_RPATH_FALSE= ++fi ++ + + CC_FOR_BUILD=${CC_FOR_BUILD:-gcc} + +@@ -16386,6 +16396,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then ++ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${USE_LIBFFI_TRUE}" && test -z "${USE_LIBFFI_FALSE}"; then + as_fn_error $? "conditional \"USE_LIBFFI\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/libgo/configure.ac b/libgo/configure.ac +index a59aa091d1d..6f1ac32660b 100644 +--- a/libgo/configure.ac ++++ b/libgo/configure.ac +@@ -53,6 +53,7 @@ AC_LIBTOOL_DLOPEN + AM_PROG_LIBTOOL + AC_SUBST(enable_shared) + AC_SUBST(enable_static) ++AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + + CC_FOR_BUILD=${CC_FOR_BUILD:-gcc} + AC_SUBST(CC_FOR_BUILD) +diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am +index 428f7a9dab5..ceb8c910abd 100644 +--- a/libgomp/Makefile.am ++++ b/libgomp/Makefile.am +@@ -53,9 +53,14 @@ else + libgomp_version_script = + libgomp_version_dep = + endif ++ + libgomp_version_info = -version-info $(libtool_VERSION) ++if ENABLE_DARWIN_AT_RPATH ++libgomp_darwin_rpath = -Wc,-nodefaultrpaths ++libgomp_darwin_rpath += -Wl,-rpath,@loader_path ++endif + libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ +- $(lt_host_flags) ++ $(lt_host_flags) $(libgomp_darwin_rpath) + libgomp_la_LIBADD = + libgomp_la_DEPENDENCIES = $(libgomp_version_dep) + libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS) +diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in +index f1afb5ef57f..ef97186e68d 100644 +--- a/libgomp/Makefile.in ++++ b/libgomp/Makefile.in +@@ -535,8 +535,11 @@ nodist_toolexeclib_HEADERS = libgomp.spec + @LIBGOMP_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE@libgomp_version_dep = libgomp.ver + @LIBGOMP_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE@libgomp_version_dep = libgomp.ver-sun + libgomp_version_info = -version-info $(libtool_VERSION) ++@ENABLE_DARWIN_AT_RPATH_TRUE@libgomp_darwin_rpath = \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path + libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ +- $(lt_host_flags) ++ $(lt_host_flags) $(libgomp_darwin_rpath) - # All done. -diff --git a/libobjc/configure b/libobjc/configure -index 5d1b424a66d..21ac18723c3 100755 ---- a/libobjc/configure -+++ b/libobjc/configure -@@ -636,6 +636,9 @@ OBJC_BOEHM_GC_LIBS - OBJC_BOEHM_GC_INCLUDES - OBJC_BOEHM_GC - OBJC_GCFLAGS -+extra_ldflags_libobjc + libgomp_la_LIBADD = $(DL_LIBS) + libgomp_la_DEPENDENCIES = $(libgomp_version_dep) +diff --git a/libgomp/configure b/libgomp/configure +index ed18809ff1c..2d19357d123 100755 +--- a/libgomp/configure ++++ b/libgomp/configure +@@ -682,6 +682,8 @@ FC + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +ENABLE_DARWIN_AT_RPATH_FALSE +ENABLE_DARWIN_AT_RPATH_TRUE - SET_MAKE - CPP - OTOOL64 -@@ -667,7 +670,6 @@ RANLIB - AR - AS - XCFLAGS --extra_ldflags_libobjc + enable_static + enable_shared lt_host_flags - OBJEXT - EXEEXT -@@ -755,6 +757,7 @@ with_pic +@@ -822,6 +824,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath + enable_maintainer_mode + enable_linux_futex enable_tls - enable_objc_gc - with_target_bdw_gc -@@ -1392,6 +1395,8 @@ Optional Features: +@@ -1477,6 +1480,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables - --enable-tls Use thread-local storage [default=yes] - --enable-objc-gc enable use of Boehm's garbage collector with the GNU - Objective-C runtime -@@ -3430,17 +3435,6 @@ esac - - - --case "${host}" in -- *-darwin*) -- # Darwin needs -single_module when linking libobjc -- extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' -- ;; -- *-cygwin*|*-mingw*) -- # Tell libtool to build DLLs on Windows -- extra_ldflags_libobjc='$(lt_host_flags)' -- ;; --esac -- - - # Add CET specific flags if CET is enabled - -@@ -3466,7 +3460,7 @@ case "$host" in - case "$enable_cet" in - auto) - # Check if target supports multi-byte NOPs -- # and if assembler supports CET insn. -+ # and if compiler and assembler support CET insn. - cet_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fcf-protection" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8944,6 +8938,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer +@@ -7621,7 +7626,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9594,6 +9599,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11002,8 +8389,9 @@ index 5d1b424a66d..21ac18723c3 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11011,15 +8399,16 @@ index 5d1b424a66d..21ac18723c3 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11033,50 +8422,42 @@ index 5d1b424a66d..21ac18723c3 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -8961,10 +8996,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9611,9 +9659,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -10771,7 +10815,7 @@ else +@@ -11419,7 +11471,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10784 "configure" -+#line 10818 "configure" +-#line 11422 "configure" ++#line 11474 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10877,7 +10921,7 @@ else +@@ -11525,7 +11577,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10890 "configure" -+#line 10924 "configure" +-#line 11528 "configure" ++#line 11580 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11149,6 +11193,38 @@ $as_echo "no" >&6; } - fi +@@ -11786,6 +11838,14 @@ esac + + if test x$enable_darwin_at_rpath = xyes; then @@ -11087,169 +8468,277 @@ index 5d1b424a66d..21ac18723c3 100755 + ENABLE_DARWIN_AT_RPATH_FALSE= +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +@@ -13461,6 +13521,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + darwin* | rhapsody*) + + ++ ++ # Publish an arg to allow the user to select that Darwin host (and target) ++ # libraries should be given install-names like @rpath/libfoo.dylib. This ++ # requires that the user of the library then adds an 'rpath' to the DSO that ++ # needs access. ++ # NOTE: there are defaults below, for systems that support rpaths. The person ++ # configuring can override the defaults for any system version that supports ++ # them - they are, however, forced off for system versions without support. ++ # Check whether --enable-darwin-at-rpath was given. ++if test "${enable_darwin_at_rpath+set}" = set; then : ++ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then ++ # This is not supported before macOS 10.5 / Darwin9. ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} ++ enable_darwin_at_rpath=no ++ ;; ++ esac ++ fi ++else ++ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in ++ # As above, before 10.5 / Darwin9 this does not work. ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ enable_darwin_at_rpath=no ++ ;; ++ ++ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use ++ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key ++ # system executables (e.g. /bin/sh). Force rpaths on for these systems. ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} ++ enable_darwin_at_rpath=yes ++ ;; ++ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can ++ # work with either DYLD_LIBRARY_PATH or embedded rpaths. ++ ++ esac ++ ++fi ++ ++ + archive_cmds_need_lc_FC=no + hardcode_direct_FC=no + hardcode_automatic_FC=yes +@@ -13478,9 +13581,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all +- archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ _lt_install_name='@rpath/\$soname' ++ fi ++ archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_FC="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_FC="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else +@@ -17122,6 +17229,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then + as_fn_error $? "conditional \"BUILD_INFO\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then ++ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/libgomp/configure.ac b/libgomp/configure.ac +index cc96e5b753b..cef33212028 100644 +--- a/libgomp/configure.ac ++++ b/libgomp/configure.ac +@@ -149,6 +149,7 @@ AM_PROG_LIBTOOL + ACX_LT_HOST_FLAGS + AC_SUBST(enable_shared) + AC_SUBST(enable_static) ++AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + + AM_MAINTAINER_MODE + +diff --git a/libiberty/configure b/libiberty/configure +index 860f981fa18..b8a19c42110 100755 +--- a/libiberty/configure ++++ b/libiberty/configure +@@ -5258,8 +5258,8 @@ case "${enable_shared}" in + *) shared=yes ;; + esac + +-# ...unless --enable-host-shared was passed from top-level config: +-if [ "${enable_host_shared}" = "yes" ]; then ++# ...unless --enable-host-{shared,pie} was passed from top-level config: ++if [ "${enable_host_shared}" = "yes" ] || [ "${enable_host_pie}" = "yes" ]; then + shared=yes + fi + +diff --git a/libiberty/configure.ac b/libiberty/configure.ac +index 28d996f9cf7..6747a7b5cff 100644 +--- a/libiberty/configure.ac ++++ b/libiberty/configure.ac +@@ -233,8 +233,8 @@ case "${enable_shared}" in + *) shared=yes ;; + esac + +-# ...unless --enable-host-shared was passed from top-level config: +-if [[ "${enable_host_shared}" = "yes" ]]; then ++# ...unless --enable-host-{shared,pie} was passed from top-level config: ++if [[ "${enable_host_shared}" = "yes" ]] || [[ "${enable_host_pie}" = "yes" ]]; then + shared=yes + fi + +diff --git a/libitm/Makefile.am b/libitm/Makefile.am +index 3f31ad30556..a25317b07fe 100644 +--- a/libitm/Makefile.am ++++ b/libitm/Makefile.am +@@ -54,7 +54,12 @@ libitm_version_info = -version-info $(libtool_VERSION) + # want or need libstdc++. + libitm_la_DEPENDENCIES = $(libitm_version_dep) + libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS) +-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) ++if ENABLE_DARWIN_AT_RPATH ++libitm_darwin_rpath = -Wc,-nodefaultrpaths ++libitm_darwin_rpath += -Wl,-rpath,@loader_path ++endif ++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) \ ++ $(libitm_darwin_rpath) + + libitm_la_SOURCES = \ + aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \ +diff --git a/libitm/Makefile.in b/libitm/Makefile.in +index 7f53ea9b9db..ed28db45057 100644 +--- a/libitm/Makefile.in ++++ b/libitm/Makefile.in +@@ -481,7 +481,12 @@ libitm_version_info = -version-info $(libtool_VERSION) + # want or need libstdc++. + libitm_la_DEPENDENCIES = $(libitm_version_dep) + libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS) +-libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) ++@ENABLE_DARWIN_AT_RPATH_TRUE@libitm_darwin_rpath = \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ ++@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path ++libitm_la_LDFLAGS = $(libitm_version_info) $(libitm_version_script) \ ++ $(libitm_darwin_rpath) ++ + libitm_la_SOURCES = aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc \ + barrier.cc beginend.cc clone.cc eh_cpp.cc local.cc query.cc \ + retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \ +diff --git a/libitm/config/aarch64/sjlj.S b/libitm/config/aarch64/sjlj.S +index 0342516cdc8..2c27f46dc43 100644 +--- a/libitm/config/aarch64/sjlj.S ++++ b/libitm/config/aarch64/sjlj.S +@@ -57,10 +57,19 @@ + + .text + .align 2 ++#if __ELF__ + .global _ITM_beginTransaction + .type _ITM_beginTransaction, %function + + _ITM_beginTransaction: ++ ++#elif __MACH__ ++ .global __ITM_beginTransaction + -+# Must come after libtool is initialized. -+case "${host}" in -+ *-darwin[4567]*) -+ # Earlier Darwin versions need -single_module when linking libobjc; they -+ # do not support @rpath. -+ extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' -+ ;; -+ *-darwin*) -+ # Otherwise, single_module is the default and multi-module is ignored and -+ # obsolete. -+ extra_ldflags_libobjc='$(lt_host_flags)' -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wc,-nodefaultrpaths" -+ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wl,-rpath,@loader_path" -+ fi -+ ;; -+ *-cygwin*|*-mingw*) -+ # Tell libtool to build DLLs on Windows -+ extra_ldflags_libobjc='$(lt_host_flags)' -+ ;; -+esac ++__ITM_beginTransaction: + ++#endif + - # ------- - # Headers - # ------- -@@ -11890,6 +11966,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then -+ as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - - : "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 -diff --git a/libobjc/configure.ac b/libobjc/configure.ac -index f8f577cfbef..2a9bf1fed4c 100644 ---- a/libobjc/configure.ac -+++ b/libobjc/configure.ac -@@ -147,17 +147,6 @@ m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) - - # extra LD Flags which are required for targets - ACX_LT_HOST_FLAGS --case "${host}" in -- *-darwin*) -- # Darwin needs -single_module when linking libobjc -- extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' -- ;; -- *-cygwin*|*-mingw*) -- # Tell libtool to build DLLs on Windows -- extra_ldflags_libobjc='$(lt_host_flags)' -- ;; --esac --AC_SUBST(extra_ldflags_libobjc) + cfi_startproc + CFI_PAC_KEY + PAC_AND_BTI +@@ -84,8 +93,13 @@ _ITM_beginTransaction: - # Add CET specific flags if CET is enabled - GCC_CET_FLAGS(CET_FLAGS) -@@ -182,6 +171,31 @@ AM_PROG_CC_C_O + /* Invoke GTM_begin_transaction with the struct we just built. */ + mov x1, sp ++#if __ELF__ + bl GTM_begin_transaction +- ++#elif __MACH__ ++ bl _GTM_begin_transaction ++#else ++#error "unexpected object format" ++#endif + /* Return; we don't need to restore any of the call-saved regs. */ + ldp x29, x30, [sp], 11*16 + cfi_adjust_cfa_offset(-11*16) +@@ -95,14 +109,23 @@ _ITM_beginTransaction: + CFI_PAC_TOGGLE + ret + cfi_endproc ++#if __ELF__ + .size _ITM_beginTransaction, . - _ITM_beginTransaction ++#endif - AC_PROG_MAKE_SET + .align 2 ++#if __ELF__ + .global GTM_longjmp + .hidden GTM_longjmp + .type GTM_longjmp, %function -+AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + GTM_longjmp: + -+# Must come after libtool is initialized. -+case "${host}" in -+ *-darwin[[4567]]*) -+ # Earlier Darwin versions need -single_module when linking libobjc; they -+ # do not support @rpath. -+ extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' -+ ;; -+ *-darwin*) -+ # Otherwise, single_module is the default and multi-module is ignored and -+ # obsolete. -+ extra_ldflags_libobjc='$(lt_host_flags)' -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wc,-nodefaultrpaths" -+ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wl,-rpath,@loader_path" -+ fi -+ ;; -+ *-cygwin*|*-mingw*) -+ # Tell libtool to build DLLs on Windows -+ extra_ldflags_libobjc='$(lt_host_flags)' -+ ;; -+esac -+AC_SUBST(extra_ldflags_libobjc) ++#elif __MACH__ ++ .private_extern _GTM_longjmp + - # ------- - # Headers - # ------- -diff --git a/liboffloadmic/configure b/liboffloadmic/configure -index dfa8287fd75..84447cbb7eb 100755 ---- a/liboffloadmic/configure -+++ b/liboffloadmic/configure -@@ -639,6 +639,8 @@ link_offloadmic_host - lt_cv_dlopen_libs - toolexeclibdir - toolexecdir ++_GTM_longjmp: ++#endif + /* The first parameter becomes the return value (x0). + The third parameter is ignored for now. */ + cfi_startproc +@@ -126,7 +149,9 @@ GTM_longjmp: + CFI_PAC_TOGGLE + br x30 + cfi_endproc ++#if __ELF__ + .size GTM_longjmp, . - GTM_longjmp ++#endif + + /* GNU_PROPERTY_AARCH64_* macros from elf.h for use in asm code. */ + #define FEATURE_1_AND 0xc0000000 +diff --git a/libitm/configure b/libitm/configure +index 6230c04dd24..014453a3f49 100755 +--- a/libitm/configure ++++ b/libitm/configure +@@ -660,6 +660,8 @@ libtool_VERSION + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE +ENABLE_DARWIN_AT_RPATH_FALSE +ENABLE_DARWIN_AT_RPATH_TRUE + enable_static + enable_shared CXXCPP - OTOOL64 - OTOOL -@@ -782,6 +784,7 @@ with_pic +@@ -810,6 +812,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath - with_gcc_major_version_only - ' - ac_precious_vars='build_alias -@@ -1434,6 +1437,8 @@ Optional Features: + enable_maintainer_mode + enable_linux_futex + enable_tls +@@ -1462,6 +1465,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -7900,23 +7905,25 @@ _LT_EOF - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 - $as_echo "$lt_cv_ld_force_load" >&6; } -- case $host_os in -- rhapsody* | darwin1.[012]) -+ # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to -+ # build without first building modern cctools / linker. -+ case $host_cpu-$host_os in -+ *-rhapsody* | *-darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.*) -+ *-darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ *-darwin*) -+ # darwin 5.x (macOS 10.1) onwards we only need to adjust when the -+ # deployment target is forced to an earlier version. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in -+ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) -+ ;; + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer +@@ -8283,7 +8288,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; 10.[012][,.]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- esac -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ *) -+ ;; -+ esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then -@@ -9614,6 +9621,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10257,6 +10262,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11266,8 +8755,9 @@ index dfa8287fd75..84447cbb7eb 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11275,15 +8765,16 @@ index dfa8287fd75..84447cbb7eb 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11297,49 +8788,41 @@ index dfa8287fd75..84447cbb7eb 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9631,10 +9679,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10274,9 +10322,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -11420,7 +11477,7 @@ else +@@ -12082,7 +12134,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11433 "configure" -+#line 11480 "configure" +-#line 12085 "configure" ++#line 12137 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11526,7 +11583,7 @@ else +@@ -12188,7 +12240,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11539 "configure" -+#line 11586 "configure" +-#line 12191 "configure" ++#line 12243 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12402,6 +12459,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13064,6 +13116,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11356,8 +8839,9 @@ index dfa8287fd75..84447cbb7eb 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11365,15 +8849,16 @@ index dfa8287fd75..84447cbb7eb 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11387,65 +8872,32 @@ index dfa8287fd75..84447cbb7eb 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -12419,12 +12517,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13081,12 +13176,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -14265,16 +14376,6 @@ freebsd* | dragonfly*) - esac - ;; +@@ -15458,6 +15561,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; -- - haiku*) - version_type=linux - need_lib_prefix=no -@@ -14396,7 +14497,7 @@ linux*oldld* | linux*aout* | linux*coff*) - # project, but have not yet been accepted: they are GCC-local changes - # for the time being. (See - # https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html) --linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -14784,6 +14885,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Only expand once: + if test x$enable_darwin_at_rpath = xyes; then @@ -11456,137 +8908,148 @@ index dfa8287fd75..84447cbb7eb 100755 + ENABLE_DARWIN_AT_RPATH_FALSE= +fi + -+ - # Forbid libtool to hardcode RPATH, because we want to be able to specify - # library search directory using LD_LIBRARY_PATH - hardcode_into_libs=no -@@ -14999,6 +15109,10 @@ if test -z "${LIBOFFLOADMIC_HOST_TRUE}" && test -z "${LIBOFFLOADMIC_HOST_FALSE}" - as_fn_error $? "conditional \"LIBOFFLOADMIC_HOST\" was never defined. + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +@@ -18216,6 +18327,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then + as_fn_error $? "conditional \"BUILD_INFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DARWIN_AT_RPATH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi - - : "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 -diff --git a/liboffloadmic/configure.ac b/liboffloadmic/configure.ac -index f64f182e8ef..b96e7eaf9e3 100644 ---- a/liboffloadmic/configure.ac -+++ b/liboffloadmic/configure.ac -@@ -118,6 +118,8 @@ esac - - AC_LIBTOOL_DLOPEN + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/libitm/configure.ac b/libitm/configure.ac +index 050d6b23e18..d0d108e1737 100644 +--- a/libitm/configure.ac ++++ b/libitm/configure.ac +@@ -157,6 +157,7 @@ AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") AM_PROG_LIBTOOL + AC_SUBST(enable_shared) + AC_SUBST(enable_static) +AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) -+ - # Forbid libtool to hardcode RPATH, because we want to be able to specify - # library search directory using LD_LIBRARY_PATH - hardcode_into_libs=no -diff --git a/liboffloadmic/plugin/Makefile.in b/liboffloadmic/plugin/Makefile.in -index 8d5ad0025c2..c53f2d32b3b 100644 ---- a/liboffloadmic/plugin/Makefile.in -+++ b/liboffloadmic/plugin/Makefile.in -@@ -123,10 +123,10 @@ subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../config/acx.m4 \ - $(top_srcdir)/../../config/depstand.m4 \ -- $(top_srcdir)/../../config/toolexeclibdir.m4 \ - $(top_srcdir)/../../config/lead-dot.m4 \ - $(top_srcdir)/../../config/multi.m4 \ - $(top_srcdir)/../../config/override.m4 \ -+ $(top_srcdir)/../../config/toolexeclibdir.m4 \ - $(top_srcdir)/../../libtool.m4 \ - $(top_srcdir)/../../ltoptions.m4 \ - $(top_srcdir)/../../ltsugar.m4 \ -diff --git a/liboffloadmic/plugin/aclocal.m4 b/liboffloadmic/plugin/aclocal.m4 -index 9fa1d1216c1..1bb91402f66 100644 ---- a/liboffloadmic/plugin/aclocal.m4 -+++ b/liboffloadmic/plugin/aclocal.m4 -@@ -1169,10 +1169,10 @@ AC_SUBST([am__untar]) - - m4_include([../../config/acx.m4]) - m4_include([../../config/depstand.m4]) --m4_include([../../config/toolexeclibdir.m4]) - m4_include([../../config/lead-dot.m4]) - m4_include([../../config/multi.m4]) - m4_include([../../config/override.m4]) -+m4_include([../../config/toolexeclibdir.m4]) - m4_include([../../libtool.m4]) - m4_include([../../ltoptions.m4]) - m4_include([../../ltsugar.m4]) -diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure -index 0b21d7d4eed..a9416401a65 100755 ---- a/liboffloadmic/plugin/configure -+++ b/liboffloadmic/plugin/configure -@@ -635,6 +635,8 @@ LIBOBJS - get_gcc_base_ver - toolexeclibdir - toolexecdir + + AM_MAINTAINER_MODE + +diff --git a/libitm/configure.tgt b/libitm/configure.tgt +index 0362e61570a..2818a587ebf 100644 +--- a/libitm/configure.tgt ++++ b/libitm/configure.tgt +@@ -50,7 +50,7 @@ fi + # Map the target cpu to an ARCH sub-directory. At the same time, + # work out any special compilation flags as necessary. + case "${target_cpu}" in +- aarch64*) ARCH=aarch64 ;; ++ aarch64* | arm64*) ARCH=aarch64 ;; + alpha*) ARCH=alpha ;; + rs6000 | powerpc*) + XCFLAGS="${XCFLAGS} -mhtm" +diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp +index da918d1ee8d..61bbfa0c923 100644 +--- a/libitm/testsuite/lib/libitm.exp ++++ b/libitm/testsuite/lib/libitm.exp +@@ -159,6 +159,7 @@ proc libitm_init { args } { + } + + if [istarget *-*-darwin*] { ++ lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" + lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc" + } + +diff --git a/libitm/testsuite/libitm.c++/c++.exp b/libitm/testsuite/libitm.c++/c++.exp +index de45e7e5480..1b0ead05fee 100644 +--- a/libitm/testsuite/libitm.c++/c++.exp ++++ b/libitm/testsuite/libitm.c++/c++.exp +@@ -56,8 +56,10 @@ if { $lang_test_file_found } { + # Gather a list of all tests. + set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] + ++ set stdcxxadder "" + if { $blddir != "" } { + set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" ++ set stdcxxadder "-B ${blddir}/${lang_library_path}" + } else { + set ld_library_path "$always_ld_library_path" + } +@@ -72,7 +74,7 @@ if { $lang_test_file_found } { + } + + # Main loop. +- dg-runtest $tests "" $libstdcxx_includes ++ dg-runtest $tests $stdcxxadder $libstdcxx_includes + } + + # All done. +diff --git a/libobjc/configure b/libobjc/configure +index 6da20b8e4ff..7087d079450 100755 +--- a/libobjc/configure ++++ b/libobjc/configure +@@ -636,6 +636,9 @@ OBJC_BOEHM_GC_LIBS + OBJC_BOEHM_GC_INCLUDES + OBJC_BOEHM_GC + OBJC_GCFLAGS ++extra_ldflags_libobjc +ENABLE_DARWIN_AT_RPATH_FALSE +ENABLE_DARWIN_AT_RPATH_TRUE - CXXCPP + SET_MAKE CPP OTOOL64 -@@ -778,6 +780,7 @@ with_pic +@@ -667,7 +670,6 @@ RANLIB + AR + AS + XCFLAGS +-extra_ldflags_libobjc + lt_host_flags + OBJEXT + EXEEXT +@@ -755,6 +757,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath - with_gcc_major_version_only - ' - ac_precious_vars='build_alias -@@ -1431,6 +1434,8 @@ Optional Features: + enable_tls + enable_objc_gc + with_target_bdw_gc +@@ -1392,6 +1395,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables + --enable-tls Use thread-local storage [default=yes] + --enable-objc-gc enable use of Boehm's garbage collector with the GNU + Objective-C runtime +@@ -3431,17 +3436,6 @@ esac - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -7280,23 +7285,25 @@ _LT_EOF - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 - $as_echo "$lt_cv_ld_force_load" >&6; } -- case $host_os in -- rhapsody* | darwin1.[012]) -+ # Allow for Darwin 4-7 (macOS 10.0-10.3) although these are not expect to -+ # build without first building modern cctools / linker. -+ case $host_cpu-$host_os in -+ *-rhapsody* | *-darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.*) -+ *-darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ *-darwin*) -+ # darwin 5.x (macOS 10.1) onwards we only need to adjust when the -+ # deployment target is forced to an earlier version. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in -+ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) -+ ;; + + +-case "${host}" in +- *-darwin*) +- # Darwin needs -single_module when linking libobjc +- extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' +- ;; +- *-cygwin*|*-mingw*) +- # Tell libtool to build DLLs on Windows +- extra_ldflags_libobjc='$(lt_host_flags)' +- ;; +-esac +- + + # Add CET specific flags if CET is enabled + +@@ -6973,7 +6967,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; 10.[012][,.]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- esac -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ *) -+ ;; -+ esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then -@@ -9261,6 +9268,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -8950,6 +8944,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11603,8 +9066,9 @@ index 0b21d7d4eed..a9416401a65 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11612,15 +9076,16 @@ index 0b21d7d4eed..a9416401a65 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11634,155 +9099,42 @@ index 0b21d7d4eed..a9416401a65 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9278,10 +9326,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8967,9 +9004,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -11067,7 +11124,7 @@ else +@@ -10796,7 +10837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11080 "configure" -+#line 11127 "configure" +-#line 10799 "configure" ++#line 10840 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11173,7 +11230,7 @@ else +@@ -10902,7 +10943,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11186 "configure" -+#line 11233 "configure" +-#line 10905 "configure" ++#line 10946 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12049,6 +12106,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - darwin* | rhapsody*) - - -+ -+ # Publish an arg to allow the user to select that Darwin host (and target) -+ # libraries should be given install-names like @rpath/libfoo.dylib. This -+ # requires that the user of the library then adds an 'rpath' to the DSO that -+ # needs access. -+ # NOTE: there are defaults below, for systems that support rpaths. The person -+ # configuring can override the defaults for any system version that supports -+ # them - they are, however, forced off for system versions without support. -+ # Check whether --enable-darwin-at-rpath was given. -+if test "${enable_darwin_at_rpath+set}" = set; then : -+ enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then -+ # This is not supported before macOS 10.5 / Darwin9. -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 -+ enable_darwin_at_rpath=no -+ ;; -+ esac -+ fi -+else -+ case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ enable_darwin_at_rpath=no -+ ;; -+ -+ # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use -+ # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key -+ # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 -+ enable_darwin_at_rpath=yes -+ ;; -+ # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can -+ # work with either DYLD_LIBRARY_PATH or embedded rpaths. -+ -+ esac -+ -+fi -+ -+ - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes -@@ -12066,12 +12164,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi - if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ fi - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - -@@ -13912,16 +14023,6 @@ freebsd* | dragonfly*) - esac - ;; - --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; -- - haiku*) - version_type=linux - need_lib_prefix=no -@@ -14043,7 +14144,7 @@ linux*oldld* | linux*aout* | linux*coff*) - # project, but have not yet been accepted: they are GCC-local changes - # for the time being. (See - # https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html) --linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -14431,6 +14532,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Only expand once: +@@ -11174,6 +11215,38 @@ $as_echo "no" >&6; } + fi + if test x$enable_darwin_at_rpath = xyes; then @@ -11794,11 +9146,34 @@ index 0b21d7d4eed..a9416401a65 100755 +fi + + - # Forbid libtool to hardcode RPATH, because we want to be able to specify - # library search directory using LD_LIBRARY_PATH - hardcode_into_libs=no -@@ -14634,6 +14744,10 @@ if test -z "${PLUGIN_HOST_TRUE}" && test -z "${PLUGIN_HOST_FALSE}"; then - as_fn_error $? "conditional \"PLUGIN_HOST\" was never defined. ++# Must come after libtool is initialized. ++case "${host}" in ++ *-darwin[4567]*) ++ # Earlier Darwin versions need -single_module when linking libobjc; they ++ # do not support @rpath. ++ extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' ++ ;; ++ *-darwin*) ++ # Otherwise, single_module is the default and multi-module is ignored and ++ # obsolete. ++ extra_ldflags_libobjc='$(lt_host_flags)' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wc,-nodefaultrpaths" ++ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wl,-rpath,@loader_path" ++ fi ++ ;; ++ *-cygwin*|*-mingw*) ++ # Tell libtool to build DLLs on Windows ++ extra_ldflags_libobjc='$(lt_host_flags)' ++ ;; ++esac ++ ++ + # ------- + # Headers + # ------- +@@ -11915,6 +11988,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DARWIN_AT_RPATH_TRUE}" && test -z "${ENABLE_DARWIN_AT_RPATH_FALSE}"; then @@ -11808,21 +9183,62 @@ index 0b21d7d4eed..a9416401a65 100755 : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 -diff --git a/liboffloadmic/plugin/configure.ac b/liboffloadmic/plugin/configure.ac -index cbcd0130d05..3329b03638d 100644 ---- a/liboffloadmic/plugin/configure.ac -+++ b/liboffloadmic/plugin/configure.ac -@@ -134,6 +134,8 @@ esac +diff --git a/libobjc/configure.ac b/libobjc/configure.ac +index 9bd7d59d597..cb21ebbfcc7 100644 +--- a/libobjc/configure.ac ++++ b/libobjc/configure.ac +@@ -148,17 +148,6 @@ m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) + + # extra LD Flags which are required for targets + ACX_LT_HOST_FLAGS +-case "${host}" in +- *-darwin*) +- # Darwin needs -single_module when linking libobjc +- extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' +- ;; +- *-cygwin*|*-mingw*) +- # Tell libtool to build DLLs on Windows +- extra_ldflags_libobjc='$(lt_host_flags)' +- ;; +-esac +-AC_SUBST(extra_ldflags_libobjc) + + # Add CET specific flags if CET is enabled + GCC_CET_FLAGS(CET_FLAGS) +@@ -183,6 +172,31 @@ AM_PROG_CC_C_O + + AC_PROG_MAKE_SET - AC_LIBTOOL_DLOPEN - AM_PROG_LIBTOOL +AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) + - # Forbid libtool to hardcode RPATH, because we want to be able to specify - # library search directory using LD_LIBRARY_PATH - hardcode_into_libs=no ++# Must come after libtool is initialized. ++case "${host}" in ++ *-darwin[[4567]]*) ++ # Earlier Darwin versions need -single_module when linking libobjc; they ++ # do not support @rpath. ++ extra_ldflags_libobjc='$(lt_host_flags) -Wl,-single_module' ++ ;; ++ *-darwin*) ++ # Otherwise, single_module is the default and multi-module is ignored and ++ # obsolete. ++ extra_ldflags_libobjc='$(lt_host_flags)' ++ if test "x$enable_darwin_at_rpath" = "xyes"; then ++ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wc,-nodefaultrpaths" ++ extra_ldflags_libobjc="${extra_ldflags_libobjc} -Wl,-rpath,@loader_path" ++ fi ++ ;; ++ *-cygwin*|*-mingw*) ++ # Tell libtool to build DLLs on Windows ++ extra_ldflags_libobjc='$(lt_host_flags)' ++ ;; ++esac ++AC_SUBST(extra_ldflags_libobjc) ++ + # ------- + # Headers + # ------- diff --git a/libphobos/configure b/libphobos/configure -index 9da06f087d0..9fbb3c91e93 100755 +index 925c53c5f5e..969ae6077cc 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -707,6 +707,8 @@ get_gcc_base_ver @@ -11851,7 +9267,16 @@ index 9da06f087d0..9fbb3c91e93 100755 --enable-werror turns on -Werror [default=no] --enable-version-specific-runtime-libs Specify that runtime libraries should be installed -@@ -9944,6 +9949,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8244,7 +8249,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9949,6 +9954,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11868,8 +9293,9 @@ index 9da06f087d0..9fbb3c91e93 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11877,15 +9303,16 @@ index 9da06f087d0..9fbb3c91e93 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11899,49 +9326,41 @@ index 9da06f087d0..9fbb3c91e93 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9961,10 +10007,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9966,9 +10014,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -11750,7 +11805,7 @@ else +@@ -11774,7 +11826,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11753 "configure" -+#line 11808 "configure" +-#line 11777 "configure" ++#line 11829 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11856,7 +11911,7 @@ else +@@ -11880,7 +11932,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11859 "configure" -+#line 11914 "configure" +-#line 11883 "configure" ++#line 11935 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13381,6 +13436,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13405,6 +13457,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -11958,8 +9377,9 @@ index 9da06f087d0..9fbb3c91e93 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -11967,15 +9387,16 @@ index 9da06f087d0..9fbb3c91e93 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -11989,31 +9410,23 @@ index 9da06f087d0..9fbb3c91e93 100755 archive_cmds_need_lc_D=no hardcode_direct_D=no hardcode_automatic_D=yes -@@ -13398,10 +13494,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13422,9 +13517,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_D="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_D="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_D="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_D="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_D="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_D="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_D="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_D="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_D="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_D="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_D="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_D="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_D="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_D="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_D="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_D="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_D="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs_D=no -@@ -14002,6 +14107,14 @@ CFLAGS=$lt_save_CFLAGS +@@ -14026,6 +14125,14 @@ CFLAGS=$lt_save_CFLAGS @@ -12028,7 +9441,7 @@ index 9da06f087d0..9fbb3c91e93 100755 # libtool variables for Phobos shared and position-independent compiles. # -@@ -15726,6 +15839,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +@@ -15750,6 +15857,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -12040,7 +9453,7 @@ index 9da06f087d0..9fbb3c91e93 100755 as_fn_error $? "conditional \"DRUNTIME_CPU_AARCH64\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index 31209ba2920..cc372587939 100644 +index 464f4105430..ba8b5ecd65b 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac @@ -93,6 +93,7 @@ AM_PROG_LIBTOOL @@ -12052,7 +9465,7 @@ index 31209ba2920..cc372587939 100644 # libtool variables for Phobos shared and position-independent compiles. # diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am -index 6ca4012b713..861ec0ebc03 100644 +index 8225ba4a028..186948806d5 100644 --- a/libphobos/libdruntime/Makefile.am +++ b/libphobos/libdruntime/Makefile.am @@ -128,8 +128,11 @@ ALL_DRUNTIME_SOURCES = $(DRUNTIME_DSOURCES) $(DRUNTIME_CSOURCES) \ @@ -12069,10 +9482,10 @@ index 6ca4012b713..861ec0ebc03 100644 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF) # Also override library link commands: This is not strictly diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in -index f7f78d71ff7..9f3361c7702 100644 +index 797d6435a7c..cd13090010f 100644 --- a/libphobos/libdruntime/Makefile.in +++ b/libphobos/libdruntime/Makefile.in -@@ -805,8 +805,9 @@ ALL_DRUNTIME_SOURCES = $(DRUNTIME_DSOURCES) $(DRUNTIME_CSOURCES) \ +@@ -810,8 +810,9 @@ ALL_DRUNTIME_SOURCES = $(DRUNTIME_DSOURCES) $(DRUNTIME_CSOURCES) \ toolexeclib_LTLIBRARIES = libgdruntime.la libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES) libgdruntime_la_LIBTOOLFLAGS = @@ -12084,7 +9497,7 @@ index f7f78d71ff7..9f3361c7702 100644 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE) libgdruntime_la_DEPENDENCIES = $(DRTSTUFF) diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am -index da7a2004ff8..a47d985c5b7 100644 +index 6474fca5eb5..f6521ed5860 100644 --- a/libphobos/src/Makefile.am +++ b/libphobos/src/Makefile.am @@ -44,8 +44,11 @@ toolexeclib_DATA = libgphobos.spec @@ -12101,10 +9514,10 @@ index da7a2004ff8..a47d985c5b7 100644 libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la else diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in -index 6f58fee01ac..212ea2469f2 100644 +index a6229587e7b..cc3358b437e 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in -@@ -528,8 +528,9 @@ toolexeclib_DATA = libgphobos.spec +@@ -529,8 +529,9 @@ toolexeclib_DATA = libgphobos.spec toolexeclib_LTLIBRARIES = libgphobos.la libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) libgphobos_la_LIBTOOLFLAGS = @@ -12116,7 +9529,7 @@ index 6f58fee01ac..212ea2469f2 100644 @ENABLE_LIBDRUNTIME_ONLY_FALSE@libgphobos_la_LIBADD = \ @ENABLE_LIBDRUNTIME_ONLY_FALSE@ ../libdruntime/libgdruntime_convenience.la $(LIBZ) diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am -index 35dffb46f6e..4bf4bf6eebc 100644 +index 35dffb46f6e..0d02c95e738 100644 --- a/libquadmath/Makefile.am +++ b/libquadmath/Makefile.am @@ -36,8 +36,13 @@ endif @@ -12130,12 +9543,12 @@ index 35dffb46f6e..4bf4bf6eebc 100644 +endif libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(version_arg) $(lt_host_flags) -lm -+ $(version_arg) $(lt_host_flags) $(LIBM) $(libquadmath_darwin_rpath) ++ $(version_arg) $(lt_host_flags) $(LIBM) $(libquadmath_darwin_rpath) libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD) nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in -index 8c011212258..b59aac7f1ac 100644 +index 8c011212258..068af559457 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -355,6 +355,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -12154,12 +9567,12 @@ index 8c011212258..b59aac7f1ac 100644 +@BUILD_LIBQUADMATH_TRUE@@ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path @BUILD_LIBQUADMATH_TRUE@libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ -@BUILD_LIBQUADMATH_TRUE@ $(version_arg) $(lt_host_flags) -lm -+@BUILD_LIBQUADMATH_TRUE@ $(version_arg) $(lt_host_flags) $(LIBM) $(libquadmath_darwin_rpath) ++@BUILD_LIBQUADMATH_TRUE@ $(version_arg) $(lt_host_flags) $(LIBM) $(libquadmath_darwin_rpath) @BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD) @BUILD_LIBQUADMATH_TRUE@nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h diff --git a/libquadmath/configure b/libquadmath/configure -index b3ee64f9c7d..23a99be108f 100755 +index 958fb876c5b..9b1703d6ee5 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -644,11 +644,14 @@ LIBQUAD_USE_SYMVER_GNU_FALSE @@ -12194,7 +9607,16 @@ index b3ee64f9c7d..23a99be108f 100755 --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer -@@ -8979,6 +8985,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -7272,7 +7278,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -8984,6 +8990,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -12211,8 +9633,9 @@ index b3ee64f9c7d..23a99be108f 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -12220,15 +9643,16 @@ index b3ee64f9c7d..23a99be108f 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -12242,49 +9666,41 @@ index b3ee64f9c7d..23a99be108f 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -8996,10 +9043,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9001,9 +9050,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -10806,7 +10862,7 @@ else +@@ -10830,7 +10883,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10819 "configure" -+#line 10865 "configure" +-#line 10833 "configure" ++#line 10886 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10912,7 +10968,7 @@ else +@@ -10936,7 +10989,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10925 "configure" -+#line 10971 "configure" +-#line 10939 "configure" ++#line 10992 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11173,6 +11229,14 @@ esac +@@ -11197,6 +11250,14 @@ esac @@ -12299,7 +9715,7 @@ index b3ee64f9c7d..23a99be108f 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -@@ -12137,6 +12201,148 @@ esac +@@ -12161,6 +12222,148 @@ esac @@ -12448,16 +9864,7 @@ index b3ee64f9c7d..23a99be108f 100755 for ac_header in fenv.h langinfo.h locale.h wchar.h wctype.h limits.h ctype.h printf.h errno.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -13031,7 +13237,7 @@ case "$host" in - case "$enable_cet" in - auto) - # Check if target supports multi-byte NOPs -- # and if assembler supports CET insn. -+ # and if compiler and assembler support CET insn. - cet_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fcf-protection" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13397,6 +13603,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then +@@ -13421,6 +13624,10 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then as_fn_error $? "conditional \"BUILD_INFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -12489,18 +9896,6 @@ index eec4084a45f..94a3f2179e9 100644 AC_CHECK_HEADERS(fenv.h langinfo.h locale.h wchar.h wctype.h limits.h ctype.h printf.h errno.h) LIBQUAD_CHECK_MATH_H_SIGNGAM -diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in -index aab88deb6e8..65e7f2e9553 100644 ---- a/libsanitizer/Makefile.in -+++ b/libsanitizer/Makefile.in -@@ -345,7 +345,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am index 4f802f723d6..223d3e07816 100644 --- a/libsanitizer/asan/Makefile.am @@ -12520,18 +9915,10 @@ index 4f802f723d6..223d3e07816 100644 libasan_preinit.o: asan_preinit.o cp $< $@ diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in -index 2476fbc5a26..e88e5e0b0a7 100644 +index 7833a9a4c3f..e88e5e0b0a7 100644 --- a/libsanitizer/asan/Makefile.in +++ b/libsanitizer/asan/Makefile.in -@@ -399,7 +399,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -466,7 +465,12 @@ libasan_la_LIBADD = \ +@@ -465,7 +465,12 @@ libasan_la_LIBADD = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(top_builddir)/lsan/libsanitizer_lsan.la $(am__append_2) \ $(am__append_3) $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -12546,7 +9933,7 @@ index 2476fbc5a26..e88e5e0b0a7 100644 # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/libsanitizer/configure b/libsanitizer/configure -index 771b135573a..dfd99e34288 100755 +index e7984f96615..43b8b1b0737 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -666,6 +666,8 @@ LSAN_SUPPORTED_FALSE @@ -12575,7 +9962,16 @@ index 771b135573a..dfd99e34288 100755 --disable-werror disable building with -Werror --enable-cet enable Intel CET in target libraries [default=auto] -@@ -10553,6 +10558,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8853,7 +8858,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10558,6 +10563,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -12592,8 +9988,9 @@ index 771b135573a..dfd99e34288 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -12601,15 +9998,16 @@ index 771b135573a..dfd99e34288 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -12623,49 +10021,41 @@ index 771b135573a..dfd99e34288 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -10570,10 +10616,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10575,9 +10623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -12359,7 +12414,7 @@ else +@@ -12383,7 +12435,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12362 "configure" -+#line 12417 "configure" +-#line 12386 "configure" ++#line 12438 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12465,7 +12520,7 @@ else +@@ -12489,7 +12541,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12468 "configure" -+#line 12523 "configure" +-#line 12492 "configure" ++#line 12544 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13341,6 +13396,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13365,6 +13417,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -12682,8 +10072,9 @@ index 771b135573a..dfd99e34288 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -12691,15 +10082,16 @@ index 771b135573a..dfd99e34288 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -12713,38 +10105,31 @@ index 771b135573a..dfd99e34288 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -13358,12 +13454,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13382,12 +13477,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -15763,6 +15872,15 @@ esac +@@ -15807,6 +15910,15 @@ esac @@ -12760,7 +10145,7 @@ index 771b135573a..dfd99e34288 100755 # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -@@ -17152,6 +17270,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then +@@ -17205,6 +17317,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -12772,7 +10157,7 @@ index 771b135573a..dfd99e34288 100755 as_fn_error $? "conditional \"TSAN_SUPPORTED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac -index 7f1ef3979c4..3549b904c62 100644 +index 04cd8910ed6..5906c8d4887 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -85,6 +85,8 @@ esac @@ -12785,10 +10170,10 @@ index 7f1ef3979c4..3549b904c62 100644 if test "${multilib}" = "yes"; then diff --git a/libsanitizer/hwasan/Makefile.am b/libsanitizer/hwasan/Makefile.am -index e12c0a0ce71..4061078c734 100644 +index 5a89189f6d8..11b1a9c5c57 100644 --- a/libsanitizer/hwasan/Makefile.am +++ b/libsanitizer/hwasan/Makefile.am -@@ -46,7 +46,11 @@ libhwasan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la +@@ -47,7 +47,11 @@ libhwasan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la endif libhwasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -12799,21 +10184,13 @@ index e12c0a0ce71..4061078c734 100644 +libhwasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(link_libhwasan) $(libhwasan_darwin_rpath) - # Work around what appears to be a GNU make bug handling MAKEFLAGS - # values defined in terms of make variables, as is the case for CC and + libhwasan_preinit.o: hwasan_preinit.o + cp $< $@ diff --git a/libsanitizer/hwasan/Makefile.in b/libsanitizer/hwasan/Makefile.in -index 67553f3979d..d20f2dc6eef 100644 +index 4240aa90147..f9ec8f9c177 100644 --- a/libsanitizer/hwasan/Makefile.in +++ b/libsanitizer/hwasan/Makefile.in -@@ -387,7 +387,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -442,7 +441,10 @@ libhwasan_la_SOURCES = $(hwasan_files) +@@ -445,7 +445,10 @@ libhwasan_la_SOURCES = $(hwasan_files) libhwasan_la_LIBADD = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(am__append_1) $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -12825,30 +10202,6 @@ index 67553f3979d..d20f2dc6eef 100644 # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and -diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in -index bce788aeea7..85dd386de47 100644 ---- a/libsanitizer/interception/Makefile.in -+++ b/libsanitizer/interception/Makefile.in -@@ -317,7 +317,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -diff --git a/libsanitizer/libbacktrace/Makefile.in b/libsanitizer/libbacktrace/Makefile.in -index ece4f11a855..c0243fa4aab 100644 ---- a/libsanitizer/libbacktrace/Makefile.in -+++ b/libsanitizer/libbacktrace/Makefile.in -@@ -367,7 +367,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ diff --git a/libsanitizer/lsan/Makefile.am b/libsanitizer/lsan/Makefile.am index 6ff28ff5eea..7701b0e18cf 100644 --- a/libsanitizer/lsan/Makefile.am @@ -12869,18 +10222,10 @@ index 6ff28ff5eea..7701b0e18cf 100644 cp $< $@ diff --git a/libsanitizer/lsan/Makefile.in b/libsanitizer/lsan/Makefile.in -index 857f244cd86..078edf01fda 100644 +index d8fd4ee9557..078edf01fda 100644 --- a/libsanitizer/lsan/Makefile.in +++ b/libsanitizer/lsan/Makefile.in -@@ -362,7 +362,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -414,7 +413,12 @@ liblsan_la_LIBADD = \ +@@ -413,7 +413,12 @@ liblsan_la_LIBADD = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(top_builddir)/interception/libinterception.la \ $(am__append_1) $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -12894,7 +10239,7 @@ index 857f244cd86..078edf01fda 100644 # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and -@@ -789,7 +793,6 @@ uninstall-am: uninstall-nodist_toolexeclibHEADERS \ +@@ -788,7 +793,6 @@ uninstall-am: uninstall-nodist_toolexeclibHEADERS \ .PRECIOUS: Makefile @@ -12902,23 +10247,11 @@ index 857f244cd86..078edf01fda 100644 liblsan_preinit.o: lsan_preinit.o cp $< $@ -diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in -index c4b009fed83..e5e1c1d51fe 100644 ---- a/libsanitizer/sanitizer_common/Makefile.in -+++ b/libsanitizer/sanitizer_common/Makefile.in -@@ -354,7 +354,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am -index ae588a67df6..47ee50bee1a 100644 +index da80743da9d..01290b0313d 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am -@@ -58,7 +58,11 @@ libtsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la +@@ -57,7 +57,11 @@ libtsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la libtsan_la_DEPENDENCIES +=$(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la endif libtsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -12932,18 +10265,10 @@ index ae588a67df6..47ee50bee1a 100644 libtsan_preinit.o: tsan_preinit.o cp $< $@ diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in -index 538d2e8eb68..d6efff71e2f 100644 +index 36498832bb8..95011584bcb 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in -@@ -391,7 +391,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -466,7 +465,10 @@ libtsan_la_DEPENDENCIES = \ +@@ -464,7 +464,10 @@ libtsan_la_DEPENDENCIES = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(top_builddir)/interception/libinterception.la \ $(TSAN_TARGET_DEPENDENT_OBJECTS) $(am__append_2) @@ -12974,18 +10299,10 @@ index d480f26adc0..7769b3437e4 100644 # Use special rules for files that require RTTI support. ubsan_handlers_cxx.% ubsan_type_hash.% ubsan_type_hash_itanium.% : AM_CXXFLAGS += -frtti diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in -index 497e0338696..7e51480e970 100644 +index 92a8e387fd7..7e51480e970 100644 --- a/libsanitizer/ubsan/Makefile.in +++ b/libsanitizer/ubsan/Makefile.in -@@ -356,7 +356,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -401,7 +400,12 @@ libubsan_la_SOURCES = $(ubsan_files) +@@ -400,7 +400,12 @@ libubsan_la_SOURCES = $(ubsan_files) libubsan_la_LIBADD = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(am__append_1) $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS) @@ -13000,7 +10317,7 @@ index 497e0338696..7e51480e970 100644 # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and diff --git a/libssp/Makefile.am b/libssp/Makefile.am -index 945dc3c8336..d2a92b3aed1 100644 +index 1636e43b369..f7ed2aa6043 100644 --- a/libssp/Makefile.am +++ b/libssp/Makefile.am @@ -49,8 +49,12 @@ libssp_la_SOURCES = \ @@ -13035,7 +10352,7 @@ index bc8a0dc2b28..1cf86361b96 100644 libssp_nonshared_la_SOURCES = \ ssp-local.c diff --git a/libssp/configure b/libssp/configure -index 10ba209bde8..5d62fef54a1 100755 +index 492915d2ce0..7a3c784aaf4 100755 --- a/libssp/configure +++ b/libssp/configure @@ -636,6 +636,8 @@ LIBOBJS @@ -13064,16 +10381,16 @@ index 10ba209bde8..5d62fef54a1 100755 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -4338,7 +4343,7 @@ case "$host" in - case "$enable_cet" in - auto) - # Check if target supports multi-byte NOPs -- # and if assembler supports CET insn. -+ # and if compiler and assembler support CET insn. - cet_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fcf-protection" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -9165,6 +9170,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -7458,7 +7463,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -9170,6 +9175,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13090,8 +10407,9 @@ index 10ba209bde8..5d62fef54a1 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13099,15 +10417,16 @@ index 10ba209bde8..5d62fef54a1 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13121,49 +10440,41 @@ index 10ba209bde8..5d62fef54a1 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -9182,10 +9228,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -9187,9 +9235,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -10992,7 +11047,7 @@ else +@@ -11016,7 +11068,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11005 "configure" -+#line 11050 "configure" +-#line 11019 "configure" ++#line 11071 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11098,7 +11153,7 @@ else +@@ -11122,7 +11174,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11111 "configure" -+#line 11156 "configure" +-#line 11125 "configure" ++#line 11177 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11376,6 +11431,15 @@ fi +@@ -11400,6 +11452,15 @@ fi @@ -13179,7 +10490,7 @@ index 10ba209bde8..5d62fef54a1 100755 # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in -@@ -11585,6 +11649,10 @@ if test -z "${LIBSSP_USE_SYMVER_SUN_TRUE}" && test -z "${LIBSSP_USE_SYMVER_SUN_F +@@ -11609,6 +11670,10 @@ if test -z "${LIBSSP_USE_SYMVER_SUN_TRUE}" && test -z "${LIBSSP_USE_SYMVER_SUN_F as_fn_error $? "conditional \"LIBSSP_USE_SYMVER_SUN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13204,10 +10515,10 @@ index f30f81c54f6..90778e2355d 100644 # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index eac60392121..bdaa160dac6 100755 +index 9b602777545..7f1874c413a 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -786,6 +786,8 @@ GLIBCXX_HOSTED_TRUE +@@ -789,6 +789,8 @@ GLIBCXX_HOSTED_TRUE glibcxx_compiler_shared_flag glibcxx_compiler_pic_flag glibcxx_lt_pic_flag @@ -13216,15 +10527,15 @@ index eac60392121..bdaa160dac6 100755 enable_static enable_shared lt_host_flags -@@ -921,6 +923,7 @@ with_pic +@@ -924,6 +926,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath enable_hosted_libstdcxx + enable_libstdcxx_hosted enable_libstdcxx_verbose - enable_libstdcxx_pch -@@ -1608,6 +1611,8 @@ Optional Features: +@@ -1615,6 +1618,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -13232,8 +10543,17 @@ index eac60392121..bdaa160dac6 100755 + rpaths to be added to executables --disable-hosted-libstdcxx only build freestanding C++ runtime support - --disable-libstdcxx-verbose -@@ -10364,6 +10369,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + --disable-libstdcxx-hosted +@@ -8501,7 +8506,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10341,6 +10346,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13250,8 +10570,9 @@ index eac60392121..bdaa160dac6 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13259,15 +10580,16 @@ index eac60392121..bdaa160dac6 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13281,49 +10603,41 @@ index eac60392121..bdaa160dac6 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -10381,10 +10427,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10358,9 +10406,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -12191,7 +12246,7 @@ else +@@ -12187,7 +12239,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12194 "configure" -+#line 12249 "configure" +-#line 12190 "configure" ++#line 12242 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12297,7 +12352,7 @@ else +@@ -12293,7 +12345,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12300 "configure" -+#line 12355 "configure" +-#line 12296 "configure" ++#line 12348 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13179,6 +13234,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13175,6 +13227,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13340,8 +10654,9 @@ index eac60392121..bdaa160dac6 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13349,15 +10664,16 @@ index eac60392121..bdaa160dac6 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13371,38 +10687,31 @@ index eac60392121..bdaa160dac6 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -13196,12 +13292,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13192,12 +13287,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -15578,6 +15687,14 @@ esac +@@ -15594,6 +15697,14 @@ esac @@ -13417,61 +10726,61 @@ index eac60392121..bdaa160dac6 100755 if test "$enable_vtable_verify" = yes; then predep_objects_CXX="${predep_objects_CXX} ${glibcxx_builddir}/../libgcc/vtv_start.o" -@@ -15981,7 +16098,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } +@@ -16017,7 +16128,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF --#line 15984 "configure" -+#line 16101 "configure" +-#line 16020 "configure" ++#line 16131 "configure" int main() { typedef bool atomic_type; -@@ -16016,7 +16133,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } +@@ -16052,7 +16163,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF --#line 16019 "configure" -+#line 16136 "configure" +-#line 16055 "configure" ++#line 16166 "configure" int main() { typedef short atomic_type; -@@ -16051,7 +16168,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } +@@ -16087,7 +16198,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF --#line 16054 "configure" -+#line 16171 "configure" +-#line 16090 "configure" ++#line 16201 "configure" int main() { // NB: _Atomic_word not necessarily int. -@@ -16087,7 +16204,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } +@@ -16123,7 +16234,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF --#line 16090 "configure" -+#line 16207 "configure" +-#line 16126 "configure" ++#line 16237 "configure" int main() { typedef long long atomic_type; -@@ -16243,7 +16360,7 @@ $as_echo "mutex" >&6; } +@@ -16279,7 +16390,7 @@ $as_echo "mutex" >&6; } # unnecessary for this test. cat > conftest.$ac_ext << EOF --#line 16246 "configure" -+#line 16363 "configure" +-#line 16282 "configure" ++#line 16393 "configure" int main() { _Decimal32 d1; -@@ -16285,7 +16402,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -16321,7 +16432,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF --#line 16288 "configure" -+#line 16405 "configure" +-#line 16324 "configure" ++#line 16435 "configure" template struct same { typedef T2 type; }; -@@ -79038,6 +79155,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +@@ -73038,6 +73149,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13483,10 +10792,10 @@ index eac60392121..bdaa160dac6 100755 as_fn_error $? "conditional \"GLIBCXX_HOSTED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac -index e59bcdb2944..f3dda5a4ff9 100644 +index 91b3c1f32f2..8832c70de3c 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac -@@ -99,6 +99,7 @@ AM_PROG_LIBTOOL +@@ -108,6 +108,7 @@ AM_PROG_LIBTOOL ACX_LT_HOST_FLAGS AC_SUBST(enable_shared) AC_SUBST(enable_static) @@ -13494,27 +10803,11 @@ index e59bcdb2944..f3dda5a4ff9 100644 if test "$enable_vtable_verify" = yes; then predep_objects_CXX="${predep_objects_CXX} ${glibcxx_builddir}/../libgcc/vtv_start.o" -diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host -index ec32980aa0d..da5b1578d91 100644 ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -234,11 +234,6 @@ case "${host_os}" in - darwin8 | darwin8.* ) - # For 8+ compatibility is better if not -flat_namespace. - OPT_LDFLAGS="${OPT_LDFLAGS} -Wl,-single_module" -- case "${host_cpu}" in -- i[34567]86 | x86_64) -- OPTIMIZE_CXXFLAGS="${OPTIMIZE_CXXFLAGS} -fvisibility-inlines-hidden" -- ;; -- esac - os_include_dir="os/bsd/darwin" - ;; - darwin*) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am -index 9c3f4aca655..016d68ecd5f 100644 +index 5b9af41cdb9..925137c2ccc 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am -@@ -133,8 +133,13 @@ libstdc___la_DEPENDENCIES = \ +@@ -152,8 +152,13 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++17/libc++17convenience.la \ $(top_builddir)/src/c++20/libc++20convenience.la @@ -13530,10 +10823,10 @@ index 9c3f4aca655..016d68ecd5f 100644 libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) $(lt_host_flags) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in -index 4a06f6cfec1..0dc6c9650fc 100644 +index f42d957af36..0ce75f30708 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in -@@ -546,8 +546,11 @@ libstdc___la_DEPENDENCIES = \ +@@ -560,8 +560,11 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++17/libc++17convenience.la \ $(top_builddir)/src/c++20/libc++20convenience.la @@ -13547,9 +10840,18 @@ index 4a06f6cfec1..0dc6c9650fc 100644 libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) $(lt_host_flags) @GLIBCXX_LDBL_ALT128_COMPAT_FALSE@@GLIBCXX_LDBL_COMPAT_TRUE@LTCXXCOMPILE64 = $(LTCXXCOMPILE) diff --git a/libtool.m4 b/libtool.m4 -index 17f8e5f3074..5452de03793 100644 +index b92e284d9f9..f3bddafc19d 100644 --- a/libtool.m4 +++ b/libtool.m4 +@@ -1005,7 +1005,7 @@ _LT_EOF + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[[89]]*|UNSET,*-darwin[[12]][[0123456789]]*) ++ UNSET,*-darwin[[89]]*|UNSET,*-darwin[[12]][[0-9]]*) + ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' @@ -1039,6 +1039,45 @@ _LT_EOF m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -13568,23 +10870,23 @@ index 17f8e5f3074..5452de03793 100644 + [if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[[45678]]*|UNSET,rhapsody*|10.[[01234]][[,.]]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&AS_MESSAGE_LOG_FD ++ UNSET,darwin[[4-8]]*|UNSET,rhapsody*|10.[[0-4]][[,.]]*) ++ AC_MSG_WARN([Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)]) + enable_darwin_at_rpath=no + ;; + esac + fi], + [case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[[45678]]*|UNSET,rhapsody*|10.[[01234]][[,.]]*) ++ UNSET,darwin[[4-8]]*|UNSET,rhapsody*|10.[[0-4]][[,.]]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[[56789]]*|UNSET,darwin2*|10.1[[123456789]][[,.]]*|1[[123456789]].*[[,.]]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&AS_MESSAGE_LOG_FD ++ UNSET,darwin1[[5-9]]*|UNSET,darwin2*|10.1[[1-9]][[,.]]*|1[[1-9]].*[[,.]]* ) ++ AC_MSG_NOTICE([@rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)]) + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13596,39 +10898,32 @@ index 17f8e5f3074..5452de03793 100644 _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes -@@ -1056,13 +1095,26 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], +@@ -1056,13 +1095,21 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&AS_MESSAGE_LOG_FD -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&AS_MESSAGE_LOG_FD -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" m4_if([$1], [CXX], [ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi ],[]) -@@ -4203,6 +4255,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], +@@ -4227,6 +4274,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], [Compiler flag to prevent dynamic linking]) ])# _LT_COMPILER_PIC @@ -13636,7 +10931,7 @@ index 17f8e5f3074..5452de03793 100644 # _LT_LINKER_SHLIBS([TAGNAME]) # ---------------------------- -@@ -6441,7 +6494,6 @@ fi # test "$_lt_caught_CXX_error" != yes +@@ -6466,7 +6514,6 @@ fi # test "$_lt_caught_CXX_error" != yes AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -13645,7 +10940,7 @@ index 17f8e5f3074..5452de03793 100644 # --------------------------------- # Figure out "hidden" library dependencies from verbose diff --git a/libvtv/configure b/libvtv/configure -index d64b4af5c6b..4280e3b20a9 100755 +index e7e490d8b3e..f09f4d9dbcf 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -640,6 +640,8 @@ VTV_CYGMIN_FALSE @@ -13674,7 +10969,16 @@ index d64b4af5c6b..4280e3b20a9 100755 --enable-cet enable Intel CET in target libraries [default=auto] Optional Packages: -@@ -10448,6 +10453,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8748,7 +8753,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10453,6 +10458,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13691,8 +10995,9 @@ index d64b4af5c6b..4280e3b20a9 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13700,15 +11005,16 @@ index d64b4af5c6b..4280e3b20a9 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13722,49 +11028,41 @@ index d64b4af5c6b..4280e3b20a9 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -10465,10 +10511,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10470,9 +10518,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -12254,7 +12309,7 @@ else +@@ -12278,7 +12330,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12267 "configure" -+#line 12312 "configure" +-#line 12281 "configure" ++#line 12333 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12360,7 +12415,7 @@ else +@@ -12384,7 +12436,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12373 "configure" -+#line 12418 "configure" +-#line 12387 "configure" ++#line 12439 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13236,6 +13291,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13260,6 +13312,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13781,8 +11079,9 @@ index d64b4af5c6b..4280e3b20a9 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13790,15 +11089,16 @@ index d64b4af5c6b..4280e3b20a9 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13812,64 +11112,31 @@ index d64b4af5c6b..4280e3b20a9 100755 archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes -@@ -13253,12 +13349,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -13277,12 +13372,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring${_lt_dsymutil}" -+ else -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi -@@ -15099,16 +15208,6 @@ freebsd* | dragonfly*) - esac - ;; - --gnu*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- ;; -- - haiku*) - version_type=linux - need_lib_prefix=no -@@ -15230,7 +15329,7 @@ linux*oldld* | linux*aout* | linux*coff*) - # project, but have not yet been accepted: they are GCC-local changes - # for the time being. (See - # https://lists.gnu.org/archive/html/libtool-patches/2018-05/msg00000.html) --linux* | k*bsd*-gnu | kopensolaris*-gnu | uclinuxfdpiceabi) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | uclinuxfdpiceabi) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -15642,6 +15741,14 @@ esac +@@ -15676,6 +15779,14 @@ esac @@ -13884,16 +11151,7 @@ index d64b4af5c6b..4280e3b20a9 100755 # For libtool versioning info, format is CURRENT:REVISION:AGE libtool_VERSION=1:0:0 -@@ -15672,7 +15779,7 @@ case "$host" in - case "$enable_cet" in - auto) - # Check if target supports multi-byte NOPs -- # and if assembler supports CET insn. -+ # and if compiler and assembler support CET insn. - cet_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fcf-protection" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15987,6 +16094,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +@@ -16021,6 +16132,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13917,7 +11175,7 @@ index f3b937e4b10..50aaadbb3a3 100644 # For libtool versioning info, format is CURRENT:REVISION:AGE libtool_VERSION=1:0:0 diff --git a/lto-plugin/configure b/lto-plugin/configure -index b820accfd65..8faa13c4a8b 100755 +index d522bd24c95..23162fc0fff 100755 --- a/lto-plugin/configure +++ b/lto-plugin/configure @@ -634,6 +634,8 @@ LTLIBOBJS @@ -13929,7 +11187,7 @@ index b820accfd65..8faa13c4a8b 100755 OTOOL64 OTOOL LIPO -@@ -785,6 +787,7 @@ with_pic +@@ -786,6 +788,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock @@ -13937,7 +11195,7 @@ index b820accfd65..8faa13c4a8b 100755 ' ac_precious_vars='build_alias host_alias -@@ -1430,6 +1433,8 @@ Optional Features: +@@ -1431,6 +1434,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -13946,7 +11204,16 @@ index b820accfd65..8faa13c4a8b 100755 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -10275,6 +10280,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8603,7 +8608,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -10309,6 +10314,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -13963,8 +11230,9 @@ index b820accfd65..8faa13c4a8b 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -13972,15 +11240,16 @@ index b820accfd65..8faa13c4a8b 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -13994,49 +11263,41 @@ index b820accfd65..8faa13c4a8b 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -10292,10 +10338,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -10326,9 +10374,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -12081,7 +12136,7 @@ else +@@ -12134,7 +12186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12084 "configure" -+#line 12139 "configure" +-#line 12137 "configure" ++#line 12189 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12187,7 +12242,7 @@ else +@@ -12240,7 +12292,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12190 "configure" -+#line 12245 "configure" +-#line 12243 "configure" ++#line 12295 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12424,6 +12479,14 @@ CC="$lt_save_CC" +@@ -12477,6 +12529,14 @@ CC="$lt_save_CC" # Only expand once: @@ -14051,7 +11312,7 @@ index b820accfd65..8faa13c4a8b 100755 -@@ -12670,6 +12733,10 @@ if test -z "${LTO_PLUGIN_USE_SYMVER_SUN_TRUE}" && test -z "${LTO_PLUGIN_USE_SYMV +@@ -12723,6 +12783,10 @@ if test -z "${LTO_PLUGIN_USE_SYMVER_SUN_TRUE}" && test -z "${LTO_PLUGIN_USE_SYMV as_fn_error $? "conditional \"LTO_PLUGIN_USE_SYMVER_SUN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -14063,22 +11324,41 @@ index b820accfd65..8faa13c4a8b 100755 : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/lto-plugin/configure.ac b/lto-plugin/configure.ac -index bc5b618a495..317596288b2 100644 +index 0a7202782ae..5812bbbfc08 100644 --- a/lto-plugin/configure.ac +++ b/lto-plugin/configure.ac -@@ -88,6 +88,7 @@ AM_CONDITIONAL(LTO_PLUGIN_USE_SYMVER_GNU, [test "x$lto_plugin_use_symver" = xgnu - AM_CONDITIONAL(LTO_PLUGIN_USE_SYMVER_SUN, [test "x$lto_plugin_use_symver" = xsun]) +@@ -110,6 +110,7 @@ fi + AC_SUBST(ac_lto_plugin_extra_ldflags) AM_PROG_LIBTOOL +AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes]) ACX_LT_HOST_FLAGS AC_SUBST(target_noncanonical) AC_TYPE_INT64_T +diff --git a/zlib/Makefile.in b/zlib/Makefile.in +index 3f5102d1b87..80fe3b69116 100644 +--- a/zlib/Makefile.in ++++ b/zlib/Makefile.in +@@ -353,6 +353,8 @@ datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ + dvidir = @dvidir@ ++enable_host_pie = @enable_host_pie@ ++enable_host_shared = @enable_host_shared@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ diff --git a/zlib/configure b/zlib/configure -index f489f31bc70..f7adce0db2c 100755 +index e35ac6e7e17..ccafc4f03f7 100755 --- a/zlib/configure +++ b/zlib/configure -@@ -639,6 +639,8 @@ TARGET_LIBRARY_FALSE +@@ -635,10 +635,14 @@ am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS + PICFLAG ++enable_host_pie ++enable_host_shared + TARGET_LIBRARY_FALSE TARGET_LIBRARY_TRUE toolexeclibdir toolexecdir @@ -14087,33 +11367,38 @@ index f489f31bc70..f7adce0db2c 100755 CPP OTOOL64 OTOOL -@@ -776,6 +778,7 @@ with_pic +@@ -776,8 +780,10 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_darwin_at_rpath with_toolexeclibdir enable_host_shared ++enable_host_pie ' -@@ -1419,6 +1422,8 @@ Optional Features: + ac_precious_vars='build_alias + host_alias +@@ -1419,7 +1425,10 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-darwin-at-path install libraries with @rpath/library-name, requires + rpaths to be added to executables --enable-host-shared build host code as shared libraries ++ --enable-host-pie build host code as PIE Optional Packages: -@@ -4169,7 +4174,7 @@ case "$host" in - case "$enable_cet" in - auto) - # Check if target supports multi-byte NOPs -- # and if assembler supports CET insn. -+ # and if compiler and assembler support CET insn. - cet_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fcf-protection" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -8908,6 +8913,47 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -6934,7 +6943,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + # darwin 5.x (macOS 10.1) onwards we only need to adjust when the + # deployment target is forced to an earlier version. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host in +- UNSET,*-darwin[89]*|UNSET,*-darwin[12][0123456789]*) ++ UNSET,*-darwin[89]*|UNSET,*-darwin[12][0-9]*) + ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +@@ -8913,6 +8922,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi darwin* | rhapsody*) @@ -14130,8 +11415,9 @@ index f489f31bc70..f7adce0db2c 100755 + enableval=$enable_darwin_at_rpath; if test "x$enable_darwin_at_rpath" = "xyes"; then + # This is not supported before macOS 10.5 / Darwin9. + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) -+ echo "WARNING: Darwin @rpath library names are incompatible with macOS versions earlier than 10.5 (rpaths disabled)" 1>&5 ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&5 ++$as_echo "$as_me: WARNING: Darwin @rpath library names are incompatible with OSX versions earlier than 10.5 (rpaths disabled)" >&2;} + enable_darwin_at_rpath=no + ;; + esac @@ -14139,15 +11425,16 @@ index f489f31bc70..f7adce0db2c 100755 +else + case ${MACOSX_DEPLOYMENT_TARGET-UNSET},$host_os in + # As above, before 10.5 / Darwin9 this does not work. -+ UNSET,darwin[45678]*|UNSET,rhapsody*|10.[01234][,.]*) ++ UNSET,darwin[4-8]*|UNSET,rhapsody*|10.[0-4][,.]*) + enable_darwin_at_rpath=no + ;; + + # We cannot build and test reliably on macOS 10.11+ (Darwin15+) without use + # of rpaths, since runpaths set via DYLD_LIBRARY_PATH are elided by key + # system executables (e.g. /bin/sh). Force rpaths on for these systems. -+ UNSET,darwin1[56789]*|UNSET,darwin2*|10.1[123456789][,.]*|1[123456789].*[,.]* ) -+ echo "@rpath library names are needed on macOS versions later than 10.11 (rpaths enabled)" 1>&5 ++ UNSET,darwin1[5-9]*|UNSET,darwin2*|10.1[1-9][,.]*|1[1-9].*[,.]* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&5 ++$as_echo "$as_me: @rpath library names are needed on macOS versions later than 10.11 (rpaths have been enabled)" >&6;} + enable_darwin_at_rpath=yes + ;; + # NOTE: we are not (yet) doing anything for 10.5 .. 10.10, since they can @@ -14161,49 +11448,41 @@ index f489f31bc70..f7adce0db2c 100755 archive_cmds_need_lc=no hardcode_direct=no hardcode_automatic=yes -@@ -8925,10 +8971,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +@@ -8930,9 +8982,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='\$rpath/\$soname' + if test "x$enable_darwin_at_rpath" = "xyes"; then -+ echo "using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name @rpath/\$soname \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ echo "NOT using Darwin @rpath" 1>&5 -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ _lt_install_name='@rpath/\$soname' + fi ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name ${_lt_install_name} \$verstring ${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else - ld_shlibs=no -@@ -10735,7 +10790,7 @@ else +@@ -10759,7 +10815,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10748 "configure" -+#line 10793 "configure" +-#line 10762 "configure" ++#line 10818 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10841,7 +10896,7 @@ else +@@ -10865,7 +10921,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10854 "configure" -+#line 10899 "configure" +-#line 10868 "configure" ++#line 10924 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11078,6 +11133,14 @@ CC="$lt_save_CC" +@@ -11102,6 +11158,14 @@ CC="$lt_save_CC" # Only expand once: @@ -14218,7 +11497,41 @@ index f489f31bc70..f7adce0db2c 100755 # Find CPP now so that any conditional tests below won't do it and # thereby make the resulting definitions conditional. -@@ -11708,6 +11771,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +@@ -11548,15 +11612,31 @@ else + multilib_arg= + fi + ++# Enable --enable-host-shared. + # Check whether --enable-host-shared was given. + if test "${enable_host_shared+set}" = set; then : +- enableval=$enable_host_shared; PICFLAG=-fPIC ++ enableval=$enable_host_shared; ++fi ++ ++ ++ ++# Enable --enable-host-pie. ++# Check whether --enable-host-pie was given. ++if test "${enable_host_pie+set}" = set; then : ++ enableval=$enable_host_pie; ++fi ++ ++ ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE + else + PICFLAG= + fi + + +- + ac_config_files="$ac_config_files Makefile" + + cat >confcache <<\_ACEOF +@@ -11732,6 +11812,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -14230,7 +11543,7 @@ index f489f31bc70..f7adce0db2c 100755 as_fn_error $? "conditional \"TARGET_LIBRARY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/zlib/configure.ac b/zlib/configure.ac -index be1cfe29651..2327d003a05 100644 +index be1cfe29651..9501cdfea85 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -64,6 +64,7 @@ GCC_CET_FLAGS(CET_FLAGS) @@ -14241,3 +11554,33 @@ index be1cfe29651..2327d003a05 100644 # Find CPP now so that any conditional tests below won't do it and # thereby make the resulting definitions conditional. +@@ -122,11 +123,26 @@ else + multilib_arg= + fi + ++# Enable --enable-host-shared. + AC_ARG_ENABLE(host-shared, + [AS_HELP_STRING([--enable-host-shared], +- [build host code as shared libraries])], +-[PICFLAG=-fPIC], [PICFLAG=]) +-AC_SUBST(PICFLAG) ++ [build host code as shared libraries])]) ++AC_SUBST(enable_host_shared) ++ ++# Enable --enable-host-pie. ++AC_ARG_ENABLE(host-pie, ++[AS_HELP_STRING([--enable-host-pie], ++ [build host code as PIE])]) ++AC_SUBST(enable_host_pie) ++ ++if test x$enable_host_shared = xyes; then ++ PICFLAG=-fPIC ++elif test x$enable_host_pie = xyes; then ++ PICFLAG=-fPIE ++else ++ PICFLAG= ++fi + ++AC_SUBST(PICFLAG) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/build/pkgs/gcc/patches/gcc-xcode15-warnings.patch b/build/pkgs/gcc/patches/gcc-xcode15-warnings.patch new file mode 100644 index 00000000000..5d1a8ca9160 --- /dev/null +++ b/build/pkgs/gcc/patches/gcc-xcode15-warnings.patch @@ -0,0 +1,25 @@ +diff --git a/gcc/config/aarch64/darwin.h b/gcc/config/aarch64/darwin.h +index 5609c569dc1..9fcbfa3d777 100644 +--- a/gcc/config/aarch64/darwin.h ++++ b/gcc/config/aarch64/darwin.h +@@ -65,10 +65,6 @@ along with GCC; see the file COPYING3. If not see + #define DARWIN_NOPIE_SPEC \ + " % Date: Wed, 15 May 2024 16:05:36 -0700 Subject: [PATCH 17/21] build/pkgs/gcc/patches/gcc-multilib-multiarch.patch: Update from https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/patches/gcc-multilib-multiarch.diff\?ref_type\=heads --- .../gcc/patches/gcc-multilib-multiarch.patch | 190 +++++++++--------- 1 file changed, 98 insertions(+), 92 deletions(-) diff --git a/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch b/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch index 9a9a63bf41a..83527c7fc5c 100644 --- a/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch +++ b/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch @@ -1,14 +1,65 @@ -On 64-bit Linux target systems, install 64-bit libraries to ${prefix}/lib -instead of ${prefix}/lib64 +# DP: Don't auto-detect multilib osdirnames. -Adapted to GCC 7.2.0 from Debian's patch at: - -https://salsa.debian.org/toolchain-team/gcc/blob/988272d6dcf649c1d6018763d1ee4b4df191d607/debian/patches/gcc-multilib-multiarch.diff -diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 -index e422c44..f7d946b 100644 ---- a/gcc/config/i386/t-linux64 -+++ b/gcc/config/i386/t-linux64 -@@ -33,6 +33,16 @@ +Index: b/src/gcc/config/sparc/t-linux64 +=================================================================== +--- a/src/gcc/config/sparc/t-linux64 ++++ b/src/gcc/config/sparc/t-linux64 +@@ -25,7 +25,12 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 ++ifneq (,$(findstring sparc64,$(target))) ++MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu) ++MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:sparc-linux-gnu) ++else + MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) +-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) ++MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:sparc-linux-gnu) ++endif + + MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu) +Index: b/src/gcc/config/s390/t-linux64 +=================================================================== +--- a/src/gcc/config/s390/t-linux64 ++++ b/src/gcc/config/s390/t-linux64 +@@ -7,7 +7,12 @@ + + MULTILIB_OPTIONS = m64/m31 + MULTILIB_DIRNAMES = 64 32 ++ifneq (,$(findstring s390x,$(target))) ++MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu) ++MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:s390-linux-gnu) ++else + MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) +-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) ++MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:s390-linux-gnu) ++endif + + MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu) +Index: b/src/gcc/config/rs6000/t-linux64 +=================================================================== +--- a/src/gcc/config/rs6000/t-linux64 ++++ b/src/gcc/config/rs6000/t-linux64 +@@ -28,8 +28,13 @@ + MULTILIB_OPTIONS := m64/m32 + MULTILIB_DIRNAMES := 64 32 + MULTILIB_EXTRA_OPTS := ++ifneq (,$(findstring powerpc64,$(target))) ++MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu) ++MULTILIB_OSDIRNAMES += m32=../lib32$(call if_multiarch,:powerpc-linux-gnu) ++else + MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) ++MULTILIB_OSDIRNAMES += m32=../lib$(call if_multiarch,:powerpc-linux-gnu) ++endif + + MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu) + +Index: b/src/gcc/config/i386/t-linux64 +=================================================================== +--- a/src/gcc/config/i386/t-linux64 ++++ b/src/gcc/config/i386/t-linux64 +@@ -33,9 +33,19 @@ comma=, MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) @@ -26,38 +77,13 @@ index e422c44..f7d946b 100644 +MULTILIB_OSDIRNAMES+= m32=../lib$(call if_multiarch,:i386-linux-gnu) +MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) +endif -diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 -index 100f9da..d981884 100644 ---- a/gcc/config/mips/t-linux64 -+++ b/gcc/config/mips/t-linux64 -@@ -20,7 +20,20 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 - MULTILIB_DIRNAMES = n32 32 64 - MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) - MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) -+ -+ifneq (,$(findstring gnuabi64,$(target))) -+MULTILIB_OSDIRNAMES = \ -+ ../lib32$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -+ ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -+ ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+else ifneq (,$(findstring gnuabin32,$(target))) -+MULTILIB_OSDIRNAMES = \ -+ ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -+ ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -+ ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+else - MULTILIB_OSDIRNAMES = \ -- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+ ../lib32$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -+ ../lib$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -+ ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+endif -diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux -index 4cb63bd..c058471 100644 ---- a/gcc/config/rs6000/t-linux -+++ b/gcc/config/rs6000/t-linux + + ifneq (,$(findstring x86_64,$(target))) + ifneq (,$(findstring biarchx32.h,$(tm_include_list))) +Index: b/src/gcc/config/rs6000/t-linux +=================================================================== +--- a/src/gcc/config/rs6000/t-linux ++++ b/src/gcc/config/rs6000/t-linux @@ -2,7 +2,7 @@ # or soft-float. ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) @@ -65,56 +91,36 @@ index 4cb63bd..c058471 100644 -MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +MULTILIB_OSDIRNAMES := .=../lib$(call if_multiarch,:powerpc64-linux-gnu) else - ifneq (,$(findstring spe,$(target))) - MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1) -diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 -index 2830ed0..5a3ccb5 100644 ---- a/gcc/config/rs6000/t-linux64 -+++ b/gcc/config/rs6000/t-linux64 -@@ -28,8 +28,13 @@ - MULTILIB_OPTIONS := m64/m32 - MULTILIB_DIRNAMES := 64 32 - MULTILIB_EXTRA_OPTS := -+ifneq (,$(findstring powerpc64,$(target))) -+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu) -+MULTILIB_OSDIRNAMES += m32=../lib32$(call if_multiarch,:powerpc-linux-gnu) -+else - MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) --MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) -+MULTILIB_OSDIRNAMES += m32=../lib$(call if_multiarch,:powerpc-linux-gnu) -+endif + MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) + endif +Index: b/src/gcc/config/loongarch/t-linux +=================================================================== +--- a/src/gcc/config/loongarch/t-linux ++++ b/src/gcc/config/loongarch/t-linux +@@ -32,22 +32,19 @@ ifneq ($(call if_multiarch,yes),yes) + else + # Only define MULTIARCH_DIRNAME when multiarch is enabled, + # or it would always introduce ${target} into the search path. +- MULTIARCH_DIRNAME = $(LA_MULTIARCH_TRIPLET) ++ MULTIARCH_DIRNAME = $(call if_multiarch,loongarch64-linux-gnu) + endif - rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c - $(COMPILE) $< -diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 -index cc6ab36..677219e 100644 ---- a/gcc/config/s390/t-linux64 -+++ b/gcc/config/s390/t-linux64 -@@ -7,5 +7,10 @@ + # Don't define MULTILIB_OSDIRNAMES if multilib is disabled. + ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),) - MULTILIB_OPTIONS = m64/m31 - MULTILIB_DIRNAMES = 64 32 -+ifneq (,$(findstring s390x,$(target))) -+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu) -+MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:s390-linux-gnu) -+else - MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) --MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) -+MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:s390-linux-gnu) -+endif -diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64 -index 7511c38..6c59863 100644 ---- a/gcc/config/sparc/t-linux64 -+++ b/gcc/config/sparc/t-linux64 -@@ -25,5 +25,10 @@ + MULTILIB_OSDIRNAMES = \ +- mabi.lp64d=../lib64$\ +- $(call if_multiarch,:loongarch64-linux-gnu) ++ mabi.lp64d=../lib$(call if_multiarch,:loongarch64-linux-gnu) - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 -+ifneq (,$(findstring sparc64,$(target))) -+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu) -+MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:sparc-linux-gnu) -+else - MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) --MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) -+MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:sparc-linux-gnu) -+endif + MULTILIB_OSDIRNAMES += \ +- mabi.lp64f=../lib64/f32$\ +- $(call if_multiarch,:loongarch64-linux-gnuf32) ++ mabi.lp64f=../lib/f32$(call if_multiarch,:loongarch64-linux-gnuf32) + + MULTILIB_OSDIRNAMES += \ +- mabi.lp64s=../lib64/sf$\ +- $(call if_multiarch,:loongarch64-linux-gnusf) ++ mabi.lp64s=../lib/sf$(call if_multiarch,:loongarch64-linux-gnusf) + + endif From 6fe25bd9ff46167a158cfa77e94cee1c733b35a5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 May 2024 16:09:45 -0700 Subject: [PATCH 18/21] build/pkgs/gcc/patches/gcc-multilib-multiarch.patch: Raise one subdir level --- .../gcc/patches/gcc-multilib-multiarch.patch | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch b/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch index 83527c7fc5c..af5580055e8 100644 --- a/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch +++ b/build/pkgs/gcc/patches/gcc-multilib-multiarch.patch @@ -1,9 +1,9 @@ # DP: Don't auto-detect multilib osdirnames. -Index: b/src/gcc/config/sparc/t-linux64 +Index: b/gcc/config/sparc/t-linux64 =================================================================== ---- a/src/gcc/config/sparc/t-linux64 -+++ b/src/gcc/config/sparc/t-linux64 +--- a/gcc/config/sparc/t-linux64 ++++ b/gcc/config/sparc/t-linux64 @@ -25,7 +25,12 @@ MULTILIB_OPTIONS = m64/m32 @@ -18,10 +18,10 @@ Index: b/src/gcc/config/sparc/t-linux64 +endif MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu) -Index: b/src/gcc/config/s390/t-linux64 +Index: b/gcc/config/s390/t-linux64 =================================================================== ---- a/src/gcc/config/s390/t-linux64 -+++ b/src/gcc/config/s390/t-linux64 +--- a/gcc/config/s390/t-linux64 ++++ b/gcc/config/s390/t-linux64 @@ -7,7 +7,12 @@ MULTILIB_OPTIONS = m64/m31 @@ -36,10 +36,10 @@ Index: b/src/gcc/config/s390/t-linux64 +endif MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu) -Index: b/src/gcc/config/rs6000/t-linux64 +Index: b/gcc/config/rs6000/t-linux64 =================================================================== ---- a/src/gcc/config/rs6000/t-linux64 -+++ b/src/gcc/config/rs6000/t-linux64 +--- a/gcc/config/rs6000/t-linux64 ++++ b/gcc/config/rs6000/t-linux64 @@ -28,8 +28,13 @@ MULTILIB_OPTIONS := m64/m32 MULTILIB_DIRNAMES := 64 32 @@ -55,10 +55,10 @@ Index: b/src/gcc/config/rs6000/t-linux64 MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu) -Index: b/src/gcc/config/i386/t-linux64 +Index: b/gcc/config/i386/t-linux64 =================================================================== ---- a/src/gcc/config/i386/t-linux64 -+++ b/src/gcc/config/i386/t-linux64 +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 @@ -33,9 +33,19 @@ comma=, MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) @@ -80,10 +80,10 @@ Index: b/src/gcc/config/i386/t-linux64 ifneq (,$(findstring x86_64,$(target))) ifneq (,$(findstring biarchx32.h,$(tm_include_list))) -Index: b/src/gcc/config/rs6000/t-linux +Index: b/gcc/config/rs6000/t-linux =================================================================== ---- a/src/gcc/config/rs6000/t-linux -+++ b/src/gcc/config/rs6000/t-linux +--- a/gcc/config/rs6000/t-linux ++++ b/gcc/config/rs6000/t-linux @@ -2,7 +2,7 @@ # or soft-float. ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) @@ -93,10 +93,10 @@ Index: b/src/gcc/config/rs6000/t-linux else MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) endif -Index: b/src/gcc/config/loongarch/t-linux +Index: b/gcc/config/loongarch/t-linux =================================================================== ---- a/src/gcc/config/loongarch/t-linux -+++ b/src/gcc/config/loongarch/t-linux +--- a/gcc/config/loongarch/t-linux ++++ b/gcc/config/loongarch/t-linux @@ -32,22 +32,19 @@ ifneq ($(call if_multiarch,yes),yes) else # Only define MULTIARCH_DIRNAME when multiarch is enabled, From e225ac15010f5236c6818b01da5ba653ddc8f088 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 15 May 2024 17:39:57 -0700 Subject: [PATCH 19/21] build/pkgs/gcc/patches/gcc-multiarch.patch: Import from https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/patches/gcc-multiarch.diff\?ref_type\=heads --- build/pkgs/gcc/patches/gcc-multiarch.patch | 235 +++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 build/pkgs/gcc/patches/gcc-multiarch.patch diff --git a/build/pkgs/gcc/patches/gcc-multiarch.patch b/build/pkgs/gcc/patches/gcc-multiarch.patch new file mode 100644 index 00000000000..869bb212859 --- /dev/null +++ b/build/pkgs/gcc/patches/gcc-multiarch.patch @@ -0,0 +1,235 @@ +# DP: - Remaining multiarch patches, not yet submitted upstream. +# DP: - Add MULTIARCH_DIRNAME definitions for multilib configurations, +# DP: which are used for the non-multilib builds. + +2013-06-12 Matthias Klose + + * config/i386/t-linux64: Set MULTIARCH_DIRNAME. + * config/i386/t-kfreebsd: Set MULTIARCH_DIRNAME. + * config.gcc (i[34567]86-*-linux* | x86_64-*-linux*): Prepend + i386/t-linux to $tmake_file; + set default ABI to N64 for mips64el. + * config/mips/t-linux64: Set MULTIARCH_DIRNAME. + * config/rs6000/t-linux64: Set MULTIARCH_DIRNAME. + * config/s390/t-linux64: Set MULTIARCH_DIRNAME. + * config/sparc/t-linux64: Set MULTIARCH_DIRNAME. + * src/gcc/config/mips/mips.h: (/usr)/lib as default path. + +Index: b/gcc/config/sh/t-linux +=================================================================== +--- a/gcc/config/sh/t-linux ++++ b/gcc/config/sh/t-linux +@@ -1,3 +1,11 @@ + MULTILIB_DIRNAMES= + MULTILIB_MATCHES= ++ ++ifneq (,$(findstring sh4,$(target))) ++MULTILIB_OSDIRNAMES = .:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu ++MULTIARCH_DIRNAME = $(call if_multiarch,sh4-linux-gnu) ++else ++MULTILIB_OSDIRNAMES = .:sh3-linux-gnu sh3_nofpu-linux-gnu:sh3-linux-gnu ++MULTIARCH_DIRNAME = $(call if_multiarch,sh3-linux-gnu) ++endif + MULTILIB_EXCEPTIONS=m1 mb/m1 m2a +Index: b/gcc/config/sparc/t-linux64 +=================================================================== +--- a/gcc/config/sparc/t-linux64 ++++ b/gcc/config/sparc/t-linux64 +@@ -27,3 +27,5 @@ MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 + MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) + MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) ++ ++MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu) +Index: b/gcc/config/s390/t-linux64 +=================================================================== +--- a/gcc/config/s390/t-linux64 ++++ b/gcc/config/s390/t-linux64 +@@ -9,3 +9,5 @@ MULTILIB_OPTIONS = m64/m31 + MULTILIB_DIRNAMES = 64 32 + MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) + MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) ++ ++MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu) +Index: b/gcc/config/rs6000/t-linux64 +=================================================================== +--- a/gcc/config/rs6000/t-linux64 ++++ b/gcc/config/rs6000/t-linux64 +@@ -31,6 +31,8 @@ MULTILIB_EXTRA_OPTS := + MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) + MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) + ++MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu) ++ + rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc + $(COMPILE) $< + $(POSTCOMPILE) +Index: b/gcc/config/i386/t-linux64 +=================================================================== +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -36,3 +36,13 @@ MULTILIB_DIRNAMES = $(patsubst m%, %, + MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) + MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) + MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) ++ ++ifneq (,$(findstring x86_64,$(target))) ++ ifneq (,$(findstring biarchx32.h,$(tm_include_list))) ++ MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnux32) ++ else ++ MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnu) ++ endif ++else ++ MULTIARCH_DIRNAME = $(call if_multiarch,i386-linux-gnu) ++endif +Index: b/gcc/config/i386/t-kfreebsd +=================================================================== +--- a/gcc/config/i386/t-kfreebsd ++++ b/gcc/config/i386/t-kfreebsd +@@ -1,5 +1,9 @@ +-MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu) ++ifeq (,$(MULTIARCH_DIRNAME)) ++ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu) ++endif + + # MULTILIB_OSDIRNAMES are set in t-linux64. + KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target)))) + MULTILIB_OSDIRNAMES := $(filter-out mx32=%,$(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))) ++ ++MULTIARCH_DIRNAME := $(subst linux,$(KFREEBSD_OS),$(MULTIARCH_DIRNAME)) +Index: b/gcc/config/mips/t-linux64 +=================================================================== +--- a/gcc/config/mips/t-linux64 ++++ b/gcc/config/mips/t-linux64 +@@ -18,24 +18,28 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 ++MIPS_R6 = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),r6) ++MIPS_32 = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),32) ++MIPS_ISA = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),isa) + MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) + MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) ++ + ifeq (yes,$(enable_multiarch)) + ifneq (,$(findstring gnuabi64,$(target))) + MULTILIB_OSDIRNAMES = \ +- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ +- ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ +- ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++ ../lib32$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ ++ ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ ++ ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + else ifneq (,$(findstring gnuabin32,$(target))) + MULTILIB_OSDIRNAMES = \ +- ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ +- ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ +- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++ ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ ++ ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ ++ ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + else + MULTILIB_OSDIRNAMES = \ +- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ +- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ +- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++ ../lib32$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ ++ ../lib$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ ++ ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + endif + else + MULTILIB_OSDIRNAMES = \ +@@ -43,3 +47,13 @@ else + ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + endif ++ ++ifneq (,$(findstring abin32,$(target))) ++MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) ++else ++ifneq (,$(findstring abi64,$(target))) ++MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++else ++MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) ++endif ++endif +Index: b/gcc/config.gcc +=================================================================== +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -2519,7 +2519,8 @@ mips*-*-linux*) # Linux MIPS, either + extra_options="${extra_options} linux-android.opt" + case ${target} in + mipsisa32r6*) +- default_mips_arch=mips32r6 ++ with_arch_32="mips32r6" ++ with_arch_64="mips64r6" + ;; + mipsisa32r2*) + default_mips_arch=mips32r2 +@@ -2541,7 +2542,8 @@ mips*-*-linux*) # Linux MIPS, either + ;; + mipsisa64r6*-*-linux-gnuabi64) + default_mips_abi=64 +- default_mips_arch=mips64r6 ++ with_arch_32="mips32r6" ++ with_arch_64="mips64r6" + enable_mips_multilibs="yes" + ;; + mipsisa64r6*-*-linux*) +@@ -5656,7 +5658,7 @@ case ${target} in + ;; + i[34567]86-*-linux* | x86_64-*-linux*) + extra_objs="${extra_objs} gnu-property.o" +- tmake_file="$tmake_file i386/t-linux i386/t-gnu-property" ++ tmake_file="i386/t-linux $tmake_file i386/t-gnu-property" + ;; + i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu) + tmake_file="$tmake_file i386/t-kfreebsd" +Index: b/gcc/config/riscv/t-linux +=================================================================== +--- a/gcc/config/riscv/t-linux ++++ b/gcc/config/riscv/t-linux +@@ -1,3 +1,5 @@ + # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ + MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) + MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) ++ ++MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu) +Index: b/gcc/Makefile.in +=================================================================== +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -553,7 +553,7 @@ BUILD_SYSTEM_HEADER_DIR = `echo @BUILD_S + STMP_FIXINC = @STMP_FIXINC@ + + # Test to see whether exists in the system header files. +-LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ] ++LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h -o -f $(BUILD_SYSTEM_HEADER_DIR)/$(MULTIARCH_DIRNAME)/limits.h ] + + # Directory for prefix to system directories, for + # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. +Index: b/gcc/config/aarch64/t-aarch64-linux +=================================================================== +--- a/gcc/config/aarch64/t-aarch64-linux ++++ b/gcc/config/aarch64/t-aarch64-linux +@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm + LIB1ASMFUNCS = _aarch64_sync_cache_range + + AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) +-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) ++MULTILIB_OSDIRNAMES = mabi.lp64=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) + MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) + + MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) +Index: b/gcc/config/arc/t-multilib-linux +=================================================================== +--- a/gcc/config/arc/t-multilib-linux ++++ b/gcc/config/arc/t-multilib-linux +@@ -23,3 +23,6 @@ MULTILIB_DIRNAMES = hs archs hs38 hs38_l + # Aliases: + MULTILIB_MATCHES += mcpu?arc700=mA7 + MULTILIB_MATCHES += mcpu?arc700=mARC700 ++ ++MULTILIB_OSDIRNAMES = ++MULTIARCH_DIRNAME = $(call if_multiarch,arc-linux-gnu) From 624f90f51fb977e6ff2a27ddef92001108838ce9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 16 May 2024 18:10:37 -0700 Subject: [PATCH 20/21] Remove debian-buster-gcc_spkg from CI --- .../devcontainer.json | 25 ------- .../portability-Dockerfile | 1 - .../devcontainer.json | 25 ------- .../portability-Dockerfile | 1 - .github/workflows/docker.yml | 1 - .../developer/portability_platform_table.rst | 65 ------------------- tox.ini | 2 +- 7 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 .devcontainer/portability-debian-buster-gcc_spkg-minimal/devcontainer.json delete mode 120000 .devcontainer/portability-debian-buster-gcc_spkg-minimal/portability-Dockerfile delete mode 100644 .devcontainer/portability-debian-buster-gcc_spkg-standard/devcontainer.json delete mode 120000 .devcontainer/portability-debian-buster-gcc_spkg-standard/portability-Dockerfile diff --git a/.devcontainer/portability-debian-buster-gcc_spkg-minimal/devcontainer.json b/.devcontainer/portability-debian-buster-gcc_spkg-minimal/devcontainer.json deleted file mode 100644 index 3bca913456c..00000000000 --- a/.devcontainer/portability-debian-buster-gcc_spkg-minimal/devcontainer.json +++ /dev/null @@ -1,25 +0,0 @@ -// The command "tox -e update_docker_platforms" -// creates .devcontainer/portability-*-*/devcontainer.json -// from .devcontainer/portability-devcontainer.json.in -// See https://aka.ms/devcontainer.json for format details. -{ - "name": "debian-buster-gcc_spkg-minimal (≥ 8-core)", - "build": { - "dockerfile": "portability-Dockerfile", - // See tox.ini for definitions - "args": { - "SYSTEM_FACTOR": "debian-buster-gcc_spkg", - "PACKAGE_FACTOR": "minimal", - "DOCKER_TARGET": "with-targets", - "DOCKER_TAG": "dev" - } - }, - "containerEnv": { - "MAKE": "make -j4" - }, - "onCreateCommand": ".devcontainer/onCreate.sh", - "updateContentCommand": ".devcontainer/portability-updateContent.sh", - "extensions": [ - "ms-python.python" - ] -} diff --git a/.devcontainer/portability-debian-buster-gcc_spkg-minimal/portability-Dockerfile b/.devcontainer/portability-debian-buster-gcc_spkg-minimal/portability-Dockerfile deleted file mode 120000 index 692e2a79d64..00000000000 --- a/.devcontainer/portability-debian-buster-gcc_spkg-minimal/portability-Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../portability-Dockerfile \ No newline at end of file diff --git a/.devcontainer/portability-debian-buster-gcc_spkg-standard/devcontainer.json b/.devcontainer/portability-debian-buster-gcc_spkg-standard/devcontainer.json deleted file mode 100644 index c62b751f87f..00000000000 --- a/.devcontainer/portability-debian-buster-gcc_spkg-standard/devcontainer.json +++ /dev/null @@ -1,25 +0,0 @@ -// The command "tox -e update_docker_platforms" -// creates .devcontainer/portability-*-*/devcontainer.json -// from .devcontainer/portability-devcontainer.json.in -// See https://aka.ms/devcontainer.json for format details. -{ - "name": "debian-buster-gcc_spkg-standard (≥ 8-core)", - "build": { - "dockerfile": "portability-Dockerfile", - // See tox.ini for definitions - "args": { - "SYSTEM_FACTOR": "debian-buster-gcc_spkg", - "PACKAGE_FACTOR": "standard", - "DOCKER_TARGET": "with-targets", - "DOCKER_TAG": "dev" - } - }, - "containerEnv": { - "MAKE": "make -j4" - }, - "onCreateCommand": ".devcontainer/onCreate.sh", - "updateContentCommand": ".devcontainer/portability-updateContent.sh", - "extensions": [ - "ms-python.python" - ] -} diff --git a/.devcontainer/portability-debian-buster-gcc_spkg-standard/portability-Dockerfile b/.devcontainer/portability-debian-buster-gcc_spkg-standard/portability-Dockerfile deleted file mode 120000 index 692e2a79d64..00000000000 --- a/.devcontainer/portability-debian-buster-gcc_spkg-standard/portability-Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../portability-Dockerfile \ No newline at end of file diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 52288013188..544971c5cd5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -25,7 +25,6 @@ on: "ubuntu-lunar", "ubuntu-mantic", "ubuntu-noble", - "debian-buster-gcc_spkg", "debian-bullseye", "debian-bookworm", "debian-trixie", diff --git a/src/doc/en/developer/portability_platform_table.rst b/src/doc/en/developer/portability_platform_table.rst index bf843b0a353..6b8c0724001 100644 --- a/src/doc/en/developer/portability_platform_table.rst +++ b/src/doc/en/developer/portability_platform_table.rst @@ -376,60 +376,6 @@ .. |codespace-ubuntu-noble-maximal| image:: https://github.com/codespaces/badge.svg :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-ubuntu-noble-maximal%2Fdevcontainer.json -.. |image-debian-buster-gcc_spkg-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-system-packages - -.. |image-debian-buster-gcc_spkg-minimal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-configured - -.. |image-debian-buster-gcc_spkg-minimal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%23677895 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets-pre - -.. |image-debian-buster-gcc_spkg-minimal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%236686c1 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets - -.. |image-debian-buster-gcc_spkg-minimal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%236495ed - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-minimal-with-targets-optional - -.. |codespace-debian-buster-gcc_spkg-minimal| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-debian-buster-gcc_spkg-minimal%2Fdevcontainer.json - -.. |image-debian-buster-gcc_spkg-standard-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-system-packages - -.. |image-debian-buster-gcc_spkg-standard-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-standard-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-standard-configured - -.. |image-debian-buster-gcc_spkg-standard-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%235d8a4c - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets-pre - -.. |image-debian-buster-gcc_spkg-standard-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%2350ab2e - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets - -.. |image-debian-buster-gcc_spkg-standard-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%2344cc11 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-standard-with-targets-optional - -.. |codespace-debian-buster-gcc_spkg-standard| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-debian-buster-gcc_spkg-standard%2Fdevcontainer.json - -.. |image-debian-buster-gcc_spkg-maximal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-system-packages - -.. |image-debian-buster-gcc_spkg-maximal-configured| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-configured/latest_tag?ignore=latest,dev,*-failed&label=configured&color=%23696969 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-configured - -.. |image-debian-buster-gcc_spkg-maximal-with-targets-pre| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets-pre/latest_tag?ignore=latest,dev,*-failed&label=with-targets-pre&color=%238f6b8d - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets-pre - -.. |image-debian-buster-gcc_spkg-maximal-with-targets| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets/latest_tag?ignore=latest,dev,*-failed&label=with-targets&color=%23b46eb2 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets - -.. |image-debian-buster-gcc_spkg-maximal-with-targets-optional| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets-optional/latest_tag?ignore=latest,dev,*-failed&label=with-targets-optional&color=%23da70d6 - :target: https://ghcr.io/sagemath/sage/sage-debian-buster-gcc_spkg-maximal-with-targets-optional - -.. |codespace-debian-buster-gcc_spkg-maximal| image:: https://github.com/codespaces/badge.svg - :target: https://codespaces.new/sagemath/sage?devcontainer_path=.devcontainer%2Fportability-debian-buster-gcc_spkg-maximal%2Fdevcontainer.json - .. |image-debian-bullseye-minimal-with-system-packages| image:: https://ghcr-badge.egpl.dev/sagemath/sage/sage-debian-bullseye-minimal-with-system-packages/size?tag=dev&label=with-system-packages&color=%23696969 :target: https://ghcr.io/sagemath/sage/sage-debian-bullseye-minimal-with-system-packages @@ -2513,17 +2459,6 @@ * -    ‑*maximal* - |image-ubuntu-noble-maximal-with-system-packages| |image-ubuntu-noble-maximal-with-targets-pre| - - * - **debian**-buster-gcc_spkg - -    ‑*minimal* - - |image-debian-buster-gcc_spkg-minimal-with-system-packages| |image-debian-buster-gcc_spkg-minimal-with-targets-pre| |image-debian-buster-gcc_spkg-minimal-with-targets| |image-debian-buster-gcc_spkg-minimal-with-targets-optional| - - |codespace-debian-buster-gcc_spkg-minimal| - * -    ‑*standard* - - |image-debian-buster-gcc_spkg-standard-with-system-packages| |image-debian-buster-gcc_spkg-standard-with-targets-pre| |image-debian-buster-gcc_spkg-standard-with-targets| |image-debian-buster-gcc_spkg-standard-with-targets-optional| - - |codespace-debian-buster-gcc_spkg-standard| - * -    ‑*maximal* - - |image-debian-buster-gcc_spkg-maximal-with-system-packages| |image-debian-buster-gcc_spkg-maximal-with-targets-pre| - - * - **debian**-bullseye    ‑*minimal* diff --git a/tox.ini b/tox.ini index b06f4529afc..0994441f2c6 100644 --- a/tox.ini +++ b/tox.ini @@ -853,7 +853,7 @@ setenv = # DEFAULT_SYSTEM_FACTORS=\ ubuntu-{xenial-toolchain-gcc_9,bionic-gcc_8,focal,jammy,lunar,mantic,noble} \ - debian-{buster-gcc_spkg,bullseye,bookworm,trixie,sid} \ + debian-{bullseye,bookworm,trixie,sid} \ linuxmint-{20.1,20.2,20.3,21,21.1,21.2,21.3} \ fedora-{30,31,32,33,34,35,36,37,38,39,40} \ centos-7-devtoolset-gcc_11 \ From 4187f5c8a71c8ec0ae76d25f586e390f40a4b7a9 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 19 May 2024 11:23:46 -0700 Subject: [PATCH 21/21] sage -package fix-checksum :all: --- build/pkgs/gcc/checksums.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/pkgs/gcc/checksums.ini b/build/pkgs/gcc/checksums.ini index 6e37efd475a..272d516f07d 100644 --- a/build/pkgs/gcc/checksums.ini +++ b/build/pkgs/gcc/checksums.ini @@ -1,5 +1,4 @@ tarball=gcc-VERSION.tar.xz sha1=5f95b6d042fb37d45c6cbebfc91decfbc4fb493c -md5=e0e48554cc6e4f261d55ddee9ab69075 -cksum=1931627455 +sha256=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz