From 128eb3280665c0f227e7c514da1f7060efa5873f Mon Sep 17 00:00:00 2001 From: freswa Date: Sun, 21 Aug 2022 18:22:47 +0000 Subject: [PATCH] db-move: moved glibc from [testing] to [core] (x86_64) git-svn-id: file:///srv/repos/svn-packages/svn@454140 eb2447ed-0c53-47e4-bac8-5bc4a241df78 --- repos/core-x86_64/PKGBUILD | 4 +- repos/testing-x86_64/PKGBUILD | 229 ---------- repos/testing-x86_64/disable-clone3.diff | 22 - repos/testing-x86_64/glibc.install | 5 - ...73542B39962DF7B299931416792B4EA25340F8.asc | 56 --- ...7C7372637EC10C57D7AA6579C43DFBF1CF2187.asc | 68 --- repos/testing-x86_64/lib32-glibc.conf | 1 - repos/testing-x86_64/locale-gen | 42 -- repos/testing-x86_64/locale.gen.txt | 23 - repos/testing-x86_64/reenable_DT_HASH.patch | 145 ------ repos/testing-x86_64/sdt-config.h | 6 - repos/testing-x86_64/sdt.h | 430 ------------------ 12 files changed, 2 insertions(+), 1029 deletions(-) delete mode 100644 repos/testing-x86_64/PKGBUILD delete mode 100644 repos/testing-x86_64/disable-clone3.diff delete mode 100644 repos/testing-x86_64/glibc.install delete mode 100644 repos/testing-x86_64/keys/pgp/7273542B39962DF7B299931416792B4EA25340F8.asc delete mode 100644 repos/testing-x86_64/keys/pgp/BC7C7372637EC10C57D7AA6579C43DFBF1CF2187.asc delete mode 100644 repos/testing-x86_64/lib32-glibc.conf delete mode 100755 repos/testing-x86_64/locale-gen delete mode 100644 repos/testing-x86_64/locale.gen.txt delete mode 100644 repos/testing-x86_64/reenable_DT_HASH.patch delete mode 100644 repos/testing-x86_64/sdt-config.h delete mode 100644 repos/testing-x86_64/sdt.h diff --git a/repos/core-x86_64/PKGBUILD b/repos/core-x86_64/PKGBUILD index 78b40180b726..2a25798f854a 100644 --- a/repos/core-x86_64/PKGBUILD +++ b/repos/core-x86_64/PKGBUILD @@ -9,8 +9,8 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.36 -_commit=c804cd1c00adde061ca51711f63068c103e94eef -pkgrel=2 +_commit=e982657073c4db21459ffd9e17bc505b1d64b876 +pkgrel=3 arch=(x86_64) url='https://www.gnu.org/software/libc' license=(GPL LGPL) diff --git a/repos/testing-x86_64/PKGBUILD b/repos/testing-x86_64/PKGBUILD deleted file mode 100644 index 2a25798f854a..000000000000 --- a/repos/testing-x86_64/PKGBUILD +++ /dev/null @@ -1,229 +0,0 @@ -# Maintainer: Giancarlo Razzolini -# Maintainer: Frederik Schwan -# Contributor: Bartłomiej Piotrowski -# Contributor: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc -# NOTE: valgrind requires rebuilt with each major glibc version - -pkgbase=glibc -pkgname=(glibc lib32-glibc) -pkgver=2.36 -_commit=e982657073c4db21459ffd9e17bc505b1d64b876 -pkgrel=3 -arch=(x86_64) -url='https://www.gnu.org/software/libc' -license=(GPL LGPL) -makedepends=(git gd lib32-gcc-libs python) -options=(debug staticlibs !lto) -source=(git+https://sourceware.org/git/glibc.git#commit=${_commit} - locale.gen.txt - locale-gen - lib32-glibc.conf - sdt.h sdt-config.h - disable-clone3.diff - reenable_DT_HASH.patch -) -validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell - BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar -b2sums=('SKIP' - '46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6' - '04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3' - '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' - 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' - '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678' - 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52' - '5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051') - -prepare() { - mkdir -p glibc-build lib32-glibc-build - - [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc - cd glibc - - # Disable clone3 syscall for now - # Can be removed when eletron{9,11,12} and discord are removed or patched: - # https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574 - # Patch src: https://patchwork.ozlabs.org/project/glibc/patch/87eebkf8ph.fsf@oldenburg.str.redhat.com/ - patch -Np1 -i "${srcdir}"/disable-clone3.diff - - # re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC - # which relies on DT_HASH to be present in these libs. - # reconsider 2023-01 - patch -Np1 -i "${srcdir}"/reenable_DT_HASH.patch -} - -build() { - local _configure_flags=( - --prefix=/usr - --with-headers=/usr/include - --with-bugurl=https://bugs.archlinux.org/ - --enable-bind-now - --enable-cet - --enable-kernel=4.4 - --enable-multi-arch - --enable-stack-protector=strong - --enable-systemtap - --disable-profile - --disable-crypt - --disable-werror - ) - - cd "$srcdir/glibc-build" - - echo "slibdir=/usr/lib" >> configparms - echo "rtlddir=/usr/lib" >> configparms - echo "sbindir=/usr/bin" >> configparms - echo "rootsbindir=/usr/bin" >> configparms - - # Credits @allanmcrae - # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD - # remove fortify for building libraries - CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/} - - "$srcdir/glibc/configure" \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - "${_configure_flags[@]}" - - # build libraries with fortify disabled - echo "build-programs=no" >> configparms - make -O - - # re-enable fortify for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms - make -O - - # build info pages manually for reproducibility - make info - - cd "$srcdir/lib32-glibc-build" - export CC="gcc -m32 -mstackrealign" - export CXX="g++ -m32 -mstackrealign" - - echo "slibdir=/usr/lib32" >> configparms - echo "rtlddir=/usr/lib32" >> configparms - echo "sbindir=/usr/bin" >> configparms - echo "rootsbindir=/usr/bin" >> configparms - - "$srcdir/glibc/configure" \ - --host=i686-pc-linux-gnu \ - --libdir=/usr/lib32 \ - --libexecdir=/usr/lib32 \ - "${_configure_flags[@]}" - - # build libraries with fortify disabled - echo "build-programs=no" >> configparms - make -O - - # re-enable fortify for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms - make -O - - # pregenerate C.UTF-8 locale until it is built into glibc - # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8, FS#74864)- - elf/ld.so --library-path "$PWD" locale/localedef -c -f ../glibc/localedata/charmaps/UTF-8 -i ../glibc/localedata/locales/C ../C.UTF-8/ -} - -# Credits for skip_test() and check() @allanmcrae -# https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD -skip_test() { - test=${1} - file=${2} - sed -i "s/\b${test}\b//" "${srcdir}"/glibc/${file} -} - -check() { - cd glibc-build - - # adjust/remove buildflags that cause false-positive testsuite failures - sed -i '/FORTIFY/d' configparms # failure to build testsuite - sed -i 's/-Werror=format-security/-Wformat-security/' config.make # failure to build testsuite - sed -i '/CFLAGS/s/-fno-plt//' config.make # 16 failures - sed -i '/CFLAGS/s/-fexceptions//' config.make # 1 failure - LDFLAGS=${LDFLAGS/,-z,now/} # 10 failures - - # The following tests fail due to restrictions in the Arch build system - # The correct fix is to add the following to the systemd-nspawn call: - # --system-call-filter="@clock @memlock @pkey" - skip_test test-errno-linux sysdeps/unix/sysv/linux/Makefile - skip_test tst-mlock2 sysdeps/unix/sysv/linux/Makefile - skip_test tst-ntp_gettime sysdeps/unix/sysv/linux/Makefile - skip_test tst-ntp_gettimex sysdeps/unix/sysv/linux/Makefile - skip_test tst-pkey sysdeps/unix/sysv/linux/Makefile - skip_test tst-process_mrelease sysdeps/unix/sysv/linux/Makefile - skip_test tst-adjtime time/Makefile - skip_test tst-clock2 time/Makefile - - make -O check -} - -package_glibc() { - pkgdesc='GNU C Library' - depends=('linux-api-headers>=4.10' tzdata filesystem) - optdepends=('gd: for memusagestat' - 'perl: for mtrace') - install=glibc.install - backup=(etc/gai.conf - etc/locale.gen - etc/nscd.conf) - - make -C glibc-build install_root="$pkgdir" install - rm -f "$pkgdir"/etc/ld.so.cache - - # Shipped in tzdata - rm -f "$pkgdir"/usr/bin/{tzselect,zdump,zic} - - cd glibc - - install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d} - install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf" - install -m644 nscd/nscd.service "$pkgdir/usr/lib/systemd/system" - install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf" - install -dm755 "$pkgdir/var/db/nscd" - - install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf - - install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin" - - # Create /etc/locale.gen - install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen" - sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ - "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen" - - # install C.UTF-8 so that it is always available - install -dm755 "$pkgdir/usr/lib/locale" - cp -r "$srcdir/C.UTF-8" -t "$pkgdir/usr/lib/locale" - sed -i '/#C\.UTF-8 /d' "$pkgdir/etc/locale.gen" - - # Provide tracing probes to libstdc++ for exceptions, possibly for other - # libraries too. Useful for gdb's catch command. - install -Dm644 "$srcdir/sdt.h" "$pkgdir/usr/include/sys/sdt.h" - install -Dm644 "$srcdir/sdt-config.h" "$pkgdir/usr/include/sys/sdt-config.h" -} - -package_lib32-glibc() { - pkgdesc='GNU C Library (32-bit)' - depends=("glibc=$pkgver") - options+=('!emptydirs') - - cd lib32-glibc-build - - make install_root="$pkgdir" install - rm -rf "$pkgdir"/{etc,sbin,usr/{bin,sbin,share},var} - - # We need to keep 32 bit specific header files - find "$pkgdir/usr/include" -type f -not -name '*-32.h' -delete - - # Dynamic linker - install -d "$pkgdir/usr/lib" - ln -s ../lib32/ld-linux.so.2 "$pkgdir/usr/lib/" - - # Add lib32 paths to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" -} diff --git a/repos/testing-x86_64/disable-clone3.diff b/repos/testing-x86_64/disable-clone3.diff deleted file mode 100644 index f3afb952d2b7..000000000000 --- a/repos/testing-x86_64/disable-clone3.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c -index 1e7a8f6b35..4046c81180 100644 ---- a/sysdeps/unix/sysv/linux/clone-internal.c -+++ b/sysdeps/unix/sysv/linux/clone-internal.c -@@ -48,17 +48,6 @@ __clone_internal (struct clone_args *cl_args, - int (*func) (void *arg), void *arg) - { - int ret; --#ifdef HAVE_CLONE3_WRAPPER -- /* Try clone3 first. */ -- int saved_errno = errno; -- ret = __clone3 (cl_args, sizeof (*cl_args), func, arg); -- if (ret != -1 || errno != ENOSYS) -- return ret; -- -- /* NB: Restore errno since errno may be checked against non-zero -- return value. */ -- __set_errno (saved_errno); --#endif - - /* Map clone3 arguments to clone arguments. NB: No need to check - invalid clone3 specific bits in flags nor exit_signal since this diff --git a/repos/testing-x86_64/glibc.install b/repos/testing-x86_64/glibc.install deleted file mode 100644 index 351f05b263cb..000000000000 --- a/repos/testing-x86_64/glibc.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - locale-gen - - ldconfig -r . -} diff --git a/repos/testing-x86_64/keys/pgp/7273542B39962DF7B299931416792B4EA25340F8.asc b/repos/testing-x86_64/keys/pgp/7273542B39962DF7B299931416792B4EA25340F8.asc deleted file mode 100644 index 484dd1a3c5f9..000000000000 --- a/repos/testing-x86_64/keys/pgp/7273542B39962DF7B299931416792B4EA25340F8.asc +++ /dev/null @@ -1,56 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -hRUYRIMEBuHSKz3rNrJkKw== -=CWf2 ------END PGP PUBLIC KEY BLOCK----- diff --git a/repos/testing-x86_64/keys/pgp/BC7C7372637EC10C57D7AA6579C43DFBF1CF2187.asc b/repos/testing-x86_64/keys/pgp/BC7C7372637EC10C57D7AA6579C43DFBF1CF2187.asc deleted file mode 100644 index 67d0c9656848..000000000000 --- a/repos/testing-x86_64/keys/pgp/BC7C7372637EC10C57D7AA6579C43DFBF1CF2187.asc +++ /dev/null @@ -1,68 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFMAZNMBCACeatEKl6YY9iEVxzS64bPbvJsA1mLE2XFWmKXyYzm58dFqPMa0 -OQQTKCxjFCOrc+LD2KtmypttcahKnk5Lk1lNU/lV2hCuR7jJ37sL+/TFQuMMgsLP -ED6XU4/AYK3VUJvgGYLBnMVfpAGYLB5rnPvhFNx0r2KItO/CfiSEyD4g1Wu26SUA -XGOp5hbSyBRGhju+8YJlhHBBjn3vZfw7IpwAWDVjK0crqMhGDXoZwK+ADUFY5NER -AkT3Lb7d11F6+W4558WQZCYIWa3rZ62d986OE7+7xKmJUcLLWvlv5spgUmvotZ4D -MzaKba+waY5ygXdGIpm5seVIEUCTaBIe6QVLABEBAAG0KFNpZGRoZXNoIFBveWFy -ZWthciA8c2lkZGhlc2hAZ290cGx0Lm9yZz6JATgEEwECACIFAle0y0wCGwMGCwkI -BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEHnEPfvxzyGHUggIAJtLMvzHjRQi/Dg6 -oSMUMPtH7oEmgnk482dC4MGNl/bCtUV7VVIAtEN5TGvHxk1EKBNqj49Q+mZjef82 -iluW1RbXRY6+72yZ380yUC41SY+2hVOurJ//h3nvE+YHfO7QjV97yhIegc1kdwAr -VtgNNApLxj5Nc2epT824uaSznVhwyAS2OIHFLmiMYuIW338uXVEug1XKBHwJ9Mpp -Vblk4zapc9fRGvRG72ivbTGXNgcza+Kkx1IdA0XB2dEQaAE1XR0FOshKtpeSDRER -wZ17+rRT8EjmkRsR7qm1uvPSNW7wMTtlj8ox/XuSyG0Coy1NRgqe5bi53ha1kBoK -lLaxvyW0KFNpZGRoZXNoIFBveWFyZWthciA8c2lkZGhlc2hAcmVkaGF0LmNvbT6J -AT4EMAECACgFAljc8cohHSBObyBsb25nZXIgZW1wbG95ZWQgd2l0aCBSZWQgSGF0 -AAoJEHnEPfvxzyGHhvoH/3KWe6JIWptc283au0UROXog3VdBFM3pE6SgMhOlFTM2 -r9fU24rvsTZgAMC7N7TxDil0JajMR6CYXoapDncuRs4u27D4uK/oUqHxL6CHuDKw -GwURM9OjqV1kJY1gPYn9IZL3XHejg/YwxodGKK4jRJrL0prR5HSiR6QyQVgJ886D -pOyHGqUwi5GGLZVAgwo9NBsr2GEmXMBmwGU44g+UuCSBiySvXwsBDDx2j34Q166t -eoz+CHsIf4J3UPv2nIR6L0EvboTw39m55aTlyJ3dPHh8OeKwTAZCFzzOv0WxINcC -fVWnL138fOkILt4u12Tv7D2K99PI/bYv1Xeal+zRtBO0KFNpZGRoZXNoIFBveWFy -ZWthciA8c3BveWFyZWtAcmVkaGF0LmNvbT6JAT4EMAECACgFAljc8awhHSBObyBs -b25nZXIgZW1wbG95ZWQgd2l0aCBSZWQgSGF0AAoJEHnEPfvxzyGHT5UH/0eeAKeR -jobfz+8n98UgYzPZnihlS1yd8wznaVThm0cgqUp1hu3NIHuDiirr/VCRwxqP+hmJ -ulwnQsJZwMllf2riFxbnnun4VBeocENxqE/m5EHLHjKkZklhYJSxbxWysXt7BYZb -7+2S3zvlP7TCl2Hb7JhdJgUiOdondBBWAygA+uxolabetIv6X3v8evr+H87PMeOw -lcaTxO2DXPAAsGDqxPJNSzVtiB5WEz6/2fRhsSGkisDSZTs5d/SL+lLS/FfRR2NT -SN20+2/eepzMJM5fyoV9vVkytI3XxhQsepeMya34DEP92ltJnhnG/tToUvHVttOd -IIVwZtDWIYwSg6a0KVNpZGRoZXNoIFBveWFyZWthciA8c2lkQHJlc2VydmVkLWJp -dC5jb20+iQE3BBMBCAAhBQJVwGR2AhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheA -AAoJEHnEPfvxzyGHPs8H/3BzCbDhXI1txfjYCCUDJwDMtY2iqcHINZb7LPGJGDbx -vuAwEgJcbrpK6QlbAqBXAg4hwBOzM+CLZRPRQ0g4hBsNQv1m+1WIJdbUfS9ZL4O9 -XPWSHYdKY0U+83XPyaValGOPMvSb2glOy2RRRC+CECN9CaQNbfJo91ZfmMk3waNb -EpZ6Te04vZ9zdoRHz3D7qhr2U2Hazlvv6P9TGqKFRbEbMgMxBJM7L6WiiBhFIIyB -D4N0NaB0xnc1JB1fwpfrRfRT9CPWeqmeXvnt0bGJAlzpG7tc3d0evva2mMVTooyq -C8vXiCRsszcrG5NYOPYkgnt0ahqivVGXd/5F57tMtGq0PFNpZGRoZXNoIFBveWFy -ZWthciAoUGVyc29uYWwpIDxzaWRkaGVzaC5wb3lhcmVrYXJAZ21haWwuY29tPokB -OAQTAQIAIgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlTqsncACgkQecQ9 -+/HPIYd28Qf9GfOK+VgDxaTzyixbGHWVWpk1nie67BdPvaorTb1jOUVsI582jKO+ -WDIKmI2PTFk9RwsN47q4s/QyN8oCjgYCYmuj+cse8Zh5acEJx2ENJRmP0QLJU3eK -IQMxKJ7SG4UHyVBlqdchWryZq5KDGbAKf3WtMhgBzr825UnybImpZ7qPfJM8u78y -jHPQvBKkKaAzhVwC65Lt+ESQA9+EZqvYeEwlYpAq5gmKKaD/QialyI/8FEsshBqw -DdLzFMMDSjFxVukjiC5t3WJvFz52v+tzEXE0HZsV26p/LrPSA+cei/s75FBmw9qz -4AM0YDOrEaeEG+CSSPLGgQYFYMp1EX+LvrRFU2lkZGhlc2ggUG95YXJla2FyICho -dHRwczovL3NvdXJjZXdhcmUub3JnKSA8c2lkZGhlc2hAc291cmNld2FyZS5vcmc+ -iQE4BBMBAgAiBQJXtMr3AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB5 -xD378c8hh6doB/49aFm02tJCigXO7NrWRg7esjdQT66g8/LYYa2O3oHef6yACSmt -bdJWpbZ5aReRledYcsI1WVtLgUHOchrspeKVO6KWAA5cFMDjRhMP0ArhxyL4KDqz -U9AHpo3t9bYBGKNfH9Df3a0rVknkIB9NyENPAJpbJOdrND0TDWXhyOHLGsFC6WuE -MtQudfSKMOhKFqySN0xZQUKlb11n2MT479gqlw7o/UPDy1gDtssG+zG9DD72Xkq3 -lbzzthM/e7ldcB8dMRoVLl9e1XZLoOfL/RAV/z9UxHezRjjYDV69EPxzKsgj+Id3 -AzmY9XeSqUeDWX17z6ARV0mh4uGePEriEmPCuQENBFMAZNMBCAChC0iEpSfa897U -gTzZKcqsCD5+P/2QbhDSUHyFiFmDPa+9rAUR2YIopbDeyu4OhGu7y1FYL+fliJxO -D1hUGqlEmzLm047IZ2iACHklNK7JcEUartgfR5kvJmqwflGHUPjLD1RCJ6wfLq6B -X/CYe4ftjqrNjClDLGsqBckJFbcIdxyPwDE5Jiuorp9wIpDivifVi0MdkKn/ny42 -Of2SI26MG3fBitweIeJFD23lCOUzYOsXClcsVTzMvB2s32g8JVB34dOytFBVrWhb -sPb97ZWonjkyx9A9HAV8mEwKoLOwuunMrccPkK+v/rh2vDDERA0MExBMMInJN4dI -fryIQrFdABEBAAGJAR8EGAECAAkCGwwFAlTqs98ACgkQecQ9+/HPIYf1Mwf9ENd6 -C/2kvJJvbFzmvDNa6EOvTVKaqTBDhgVjuZ2ivMGdkCoeA9OQ3zWu8k+RYDyyPmuJ -HToFm1tn4hP8DGDjIr46Bb3jnZcz6bHsOp9quf3L6KbKa4ghiVqM05ML9Xb/YH0y -ge3QybfiAnWm6e2qIbzYucXmYDOBsQojta369CZ+zQEdy+baULFQ+Hg02vY4NKqv -xIhfri0B/Ng+m7MbUv163u2/7Eyit4xOrLYbouuMOxd1+TNasJPFwrKgjQNWdnPs -1pCxh+GXgf0a8WqbtB9P0wIQQbWw6OuuRmkW9zUisxuKyUo10hEHOK52v2O/7N3P -bgdMo3cl19PJpx81Tg== -=RgMn ------END PGP PUBLIC KEY BLOCK----- diff --git a/repos/testing-x86_64/lib32-glibc.conf b/repos/testing-x86_64/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43a78..000000000000 --- a/repos/testing-x86_64/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/repos/testing-x86_64/locale-gen b/repos/testing-x86_64/locale-gen deleted file mode 100755 index ee88880705a5..000000000000 --- a/repos/testing-x86_64/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/locale-archive || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/repos/testing-x86_64/locale.gen.txt b/repos/testing-x86_64/locale.gen.txt deleted file mode 100644 index ccdd817342c7..000000000000 --- a/repos/testing-x86_64/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# -# -# where is one of the locales given in /usr/share/i18n/locales -# and is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/repos/testing-x86_64/reenable_DT_HASH.patch b/repos/testing-x86_64/reenable_DT_HASH.patch deleted file mode 100644 index f828b011bd9f..000000000000 --- a/repos/testing-x86_64/reenable_DT_HASH.patch +++ /dev/null @@ -1,145 +0,0 @@ -From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Fri, 29 Apr 2022 16:37:51 +0200 -Subject: [PATCH] Do not use --hash-style=both for building glibc shared - objects - -The comment indicates that --hash-style=both was used to maintain -compatibility with static dlopen, but we had many internal ABI -changes since then, so this compatiblity does not add value anymore. - -Reviewed-by: Carlos O'Donell ---- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - config.make.in | 1 + - configure | 28 ++++++++++++++++++++++++++++ - configure.ac | 16 ++++++++++++++++ - 5 files changed, 61 insertions(+) - -diff --git b/Makeconfig a/Makeconfig -index 760f14e92f..0aa5fb0099 100644 ---- b/Makeconfig -+++ a/Makeconfig -@@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro - LDFLAGS.so += $(relro-LDFLAGS) - LDFLAGS-rtld += $(relro-LDFLAGS) - -+ifeq (yes,$(have-hash-style)) -+# For the time being we unconditionally use 'both'. At some time we -+# should declare statically linked code as 'out of luck' and compile -+# with --hash-style=gnu only. -+hashstyle-LDFLAGS = -Wl,--hash-style=both -+LDFLAGS.so += $(hashstyle-LDFLAGS) -+LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+endif -+ - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git b/Makerules a/Makerules -index 354528b8c7..428464f092 100644 ---- b/Makerules -+++ a/Makerules -@@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ $(if $(filter yes,$(have-hash-style)), \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ -+ , \ -+ -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ ) \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ -diff --git b/config.make.in a/config.make.in -index fff4c78dd0..bf728c71c0 100644 ---- b/config.make.in -+++ a/config.make.in -@@ -70,6 +70,7 @@ have-libcap = @have_libcap@ - have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ - fno-unit-at-a-time = @fno_unit_at_a_time@ - bind-now = @bindnow@ -+have-hash-style = @libc_cv_hashstyle@ - use-default-link = @use_default_link@ - have-cxx-thread_local = @libc_cv_cxx_thread_local@ - have-loop-to-function = @libc_cv_cc_loop_to_function@ -diff --git b/configure a/configure -index 716dc041b6..5a730dc5fc 100755 ---- b/configure -+++ a/configure -@@ -622,6 +622,7 @@ libc_cv_cc_nofma - libc_cv_mtls_dialect_gnu2 - fno_unit_at_a_time - libc_cv_has_glob_dat -+libc_cv_hashstyle - libc_cv_fpie - libc_cv_z_execstack - ASFLAGS_config -@@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 -+$as_echo_n "checking for --hash-style option... " >&6; } -+if ${libc_cv_hashstyle+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat > conftest.c <&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 -+$as_echo "$libc_cv_hashstyle" >&6; } -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 - $as_echo_n "checking for GLOB_DAT reloc... " >&6; } - if ${libc_cv_has_glob_dat+:} false; then : -diff --git b/configure.ac a/configure.ac -index d08ad4d64e..a045f6608e 100644 ---- b/configure.ac -+++ a/configure.ac -@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) - - AC_SUBST(libc_cv_fpie) - -+AC_CACHE_CHECK(for --hash-style option, -+ libc_cv_hashstyle, [dnl -+cat > conftest.c <&AS_MESSAGE_LOG_FD]) -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest*]) -+AC_SUBST(libc_cv_hashstyle) -+ - AC_CACHE_CHECK(for GLOB_DAT reloc, - libc_cv_has_glob_dat, [dnl - cat > conftest.c < - Systemtap static probe definition macros. - - This file is dedicated to the public domain, pursuant to CC0 - (https://creativecommons.org/publicdomain/zero/1.0/) -*/ - -#ifndef _SYS_SDT_H -#define _SYS_SDT_H 1 - -/* - This file defines a family of macros - - STAP_PROBEn(op1, ..., opn) - - that emit a nop into the instruction stream, and some data into an auxiliary - note section. The data in the note section describes the operands, in terms - of size and location. Each location is encoded as assembler operand string. - Consumer tools such as gdb or systemtap insert breakpoints on top of - the nop, and decode the location operand-strings, like an assembler, - to find the values being passed. - - The operand strings are selected by the compiler for each operand. - They are constrained by gcc inline-assembler codes. The default is: - - #define STAP_SDT_ARG_CONSTRAINT nor - - This is a good default if the operands tend to be integral and - moderate in number (smaller than number of registers). In other - cases, the compiler may report "'asm' requires impossible reload" or - similar. In this case, consider simplifying the macro call (fewer - and simpler operands), reduce optimization, or override the default - constraints string via: - - #define STAP_SDT_ARG_CONSTRAINT g - #include - - See also: - https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation - https://gcc.gnu.org/onlinedocs/gcc/Constraints.html - */ - - - -#ifdef __ASSEMBLER__ -# define _SDT_PROBE(provider, name, n, arglist) \ - _SDT_ASM_BODY(provider, name, _SDT_ASM_STRING_1, (_SDT_DEPAREN_##n arglist)) \ - _SDT_ASM_BASE -# define _SDT_ASM_1(x) x; -# define _SDT_ASM_2(a, b) a,b; -# define _SDT_ASM_3(a, b, c) a,b,c; -# define _SDT_ASM_5(a, b, c, d, e) a,b,c,d,e; -# define _SDT_ASM_STRING_1(x) .asciz #x; -# define _SDT_DEPAREN_0() /* empty */ -# define _SDT_DEPAREN_1(a) a -# define _SDT_DEPAREN_2(a,b) a b -# define _SDT_DEPAREN_3(a,b,c) a b c -# define _SDT_DEPAREN_4(a,b,c,d) a b c d -# define _SDT_DEPAREN_5(a,b,c,d,e) a b c d e -# define _SDT_DEPAREN_6(a,b,c,d,e,f) a b c d e f -# define _SDT_DEPAREN_7(a,b,c,d,e,f,g) a b c d e f g -# define _SDT_DEPAREN_8(a,b,c,d,e,f,g,h) a b c d e f g h -# define _SDT_DEPAREN_9(a,b,c,d,e,f,g,h,i) a b c d e f g h i -# define _SDT_DEPAREN_10(a,b,c,d,e,f,g,h,i,j) a b c d e f g h i j -# define _SDT_DEPAREN_11(a,b,c,d,e,f,g,h,i,j,k) a b c d e f g h i j k -# define _SDT_DEPAREN_12(a,b,c,d,e,f,g,h,i,j,k,l) a b c d e f g h i j k l -#else -# define _SDT_PROBE(provider, name, n, arglist) \ - do { \ - __asm__ __volatile__ (_SDT_ASM_BODY(provider, name, _SDT_ASM_ARGS, (n)) \ - :: _SDT_ASM_OPERANDS_##n arglist); \ - __asm__ __volatile__ (_SDT_ASM_BASE); \ - } while (0) -# define _SDT_S(x) #x -# define _SDT_ASM_1(x) _SDT_S(x) "\n" -# define _SDT_ASM_2(a, b) _SDT_S(a) "," _SDT_S(b) "\n" -# define _SDT_ASM_3(a, b, c) _SDT_S(a) "," _SDT_S(b) "," \ - _SDT_S(c) "\n" -# define _SDT_ASM_5(a, b, c, d, e) _SDT_S(a) "," _SDT_S(b) "," \ - _SDT_S(c) "," _SDT_S(d) "," \ - _SDT_S(e) "\n" -# define _SDT_ASM_ARGS(n) _SDT_ASM_STRING(_SDT_ASM_TEMPLATE_##n) -# define _SDT_ASM_STRING_1(x) _SDT_ASM_1(.asciz #x) - -# define _SDT_ARGFMT(no) %n[_SDT_S##no]@_SDT_ARGTMPL(_SDT_A##no) - -# ifndef STAP_SDT_ARG_CONSTRAINT -# if defined __powerpc__ -# define STAP_SDT_ARG_CONSTRAINT nZr -# else -# define STAP_SDT_ARG_CONSTRAINT nor -# endif -# endif - -# define _SDT_STRINGIFY(x) #x -# define _SDT_ARG_CONSTRAINT_STRING(x) _SDT_STRINGIFY(x) -# define _SDT_ARG(n, x) \ - [_SDT_S##n] "n" ((_SDT_ARGSIGNED (x) ? 1 : -1) * (int) _SDT_ARGSIZE (x)), \ - [_SDT_A##n] _SDT_ARG_CONSTRAINT_STRING (STAP_SDT_ARG_CONSTRAINT) (_SDT_ARGVAL (x)) -#endif -#define _SDT_ASM_STRING(x) _SDT_ASM_STRING_1(x) - -#define _SDT_ARGARRAY(x) (__builtin_classify_type (x) == 14 \ - || __builtin_classify_type (x) == 5) - -#ifdef __cplusplus -# define _SDT_ARGSIGNED(x) (!_SDT_ARGARRAY (x) \ - && __sdt_type<__typeof (x)>::__sdt_signed) -# define _SDT_ARGSIZE(x) (_SDT_ARGARRAY (x) \ - ? sizeof (void *) : sizeof (x)) -# define _SDT_ARGVAL(x) (x) - -# include - -template -struct __sdt_type -{ - static const bool __sdt_signed = false; -}; - -#define __SDT_ALWAYS_SIGNED(T) \ -template<> struct __sdt_type { static const bool __sdt_signed = true; }; -#define __SDT_COND_SIGNED(T,CT) \ -template<> struct __sdt_type { static const bool __sdt_signed = ((CT)(-1) < 1); }; -__SDT_ALWAYS_SIGNED(signed char) -__SDT_ALWAYS_SIGNED(short) -__SDT_ALWAYS_SIGNED(int) -__SDT_ALWAYS_SIGNED(long) -__SDT_ALWAYS_SIGNED(long long) -__SDT_ALWAYS_SIGNED(volatile signed char) -__SDT_ALWAYS_SIGNED(volatile short) -__SDT_ALWAYS_SIGNED(volatile int) -__SDT_ALWAYS_SIGNED(volatile long) -__SDT_ALWAYS_SIGNED(volatile long long) -__SDT_ALWAYS_SIGNED(const signed char) -__SDT_ALWAYS_SIGNED(const short) -__SDT_ALWAYS_SIGNED(const int) -__SDT_ALWAYS_SIGNED(const long) -__SDT_ALWAYS_SIGNED(const long long) -__SDT_ALWAYS_SIGNED(const volatile signed char) -__SDT_ALWAYS_SIGNED(const volatile short) -__SDT_ALWAYS_SIGNED(const volatile int) -__SDT_ALWAYS_SIGNED(const volatile long) -__SDT_ALWAYS_SIGNED(const volatile long long) -__SDT_COND_SIGNED(char, char) -__SDT_COND_SIGNED(wchar_t, wchar_t) -__SDT_COND_SIGNED(volatile char, char) -__SDT_COND_SIGNED(volatile wchar_t, wchar_t) -__SDT_COND_SIGNED(const char, char) -__SDT_COND_SIGNED(const wchar_t, wchar_t) -__SDT_COND_SIGNED(const volatile char, char) -__SDT_COND_SIGNED(const volatile wchar_t, wchar_t) -#if defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -/* __SDT_COND_SIGNED(char16_t) */ -/* __SDT_COND_SIGNED(char32_t) */ -#endif - -template -struct __sdt_type<__sdt_E[]> : public __sdt_type<__sdt_E *> {}; - -template -struct __sdt_type<__sdt_E[__sdt_N]> : public __sdt_type<__sdt_E *> {}; - -#elif !defined(__ASSEMBLER__) -__extension__ extern unsigned long long __sdt_unsp; -# define _SDT_ARGINTTYPE(x) \ - __typeof (__builtin_choose_expr (((__builtin_classify_type (x) \ - + 3) & -4) == 4, (x), 0U)) -# define _SDT_ARGSIGNED(x) \ - (!__extension__ \ - (__builtin_constant_p ((((unsigned long long) \ - (_SDT_ARGINTTYPE (x)) __sdt_unsp) \ - & ((unsigned long long)1 << (sizeof (unsigned long long) \ - * __CHAR_BIT__ - 1))) == 0) \ - || (_SDT_ARGINTTYPE (x)) -1 > (_SDT_ARGINTTYPE (x)) 0)) -# define _SDT_ARGSIZE(x) \ - (_SDT_ARGARRAY (x) ? sizeof (void *) : sizeof (x)) -# define _SDT_ARGVAL(x) (x) -#endif - -#if defined __powerpc__ || defined __powerpc64__ -# define _SDT_ARGTMPL(id) %I[id]%[id] -#elif defined __i386__ -# define _SDT_ARGTMPL(id) %w[id] /* gcc.gnu.org/PR80115 */ -#else -# define _SDT_ARGTMPL(id) %[id] -#endif - -#ifdef __LP64__ -# define _SDT_ASM_ADDR .8byte -#else -# define _SDT_ASM_ADDR .4byte -#endif - -/* The ia64 and s390 nop instructions take an argument. */ -#if defined(__ia64__) || defined(__s390__) || defined(__s390x__) -#define _SDT_NOP nop 0 -#else -#define _SDT_NOP nop -#endif - -#define _SDT_NOTE_NAME "stapsdt" -#define _SDT_NOTE_TYPE 3 - -/* If the assembler supports the necessary feature, then we can play - nice with code in COMDAT sections, which comes up in C++ code. - Without that assembler support, some combinations of probe placements - in certain kinds of C++ code may produce link-time errors. */ -#include "sdt-config.h" -#if _SDT_ASM_SECTION_AUTOGROUP_SUPPORT -# define _SDT_ASM_AUTOGROUP "?" -#else -# define _SDT_ASM_AUTOGROUP "" -#endif - -#define _SDT_ASM_BODY(provider, name, pack_args, args) \ - _SDT_ASM_1(990: _SDT_NOP) \ - _SDT_ASM_3( .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \ - _SDT_ASM_1( .balign 4) \ - _SDT_ASM_3( .4byte 992f-991f, 994f-993f, _SDT_NOTE_TYPE) \ - _SDT_ASM_1(991: .asciz _SDT_NOTE_NAME) \ - _SDT_ASM_1(992: .balign 4) \ - _SDT_ASM_1(993: _SDT_ASM_ADDR 990b) \ - _SDT_ASM_1( _SDT_ASM_ADDR _.stapsdt.base) \ - _SDT_SEMAPHORE(provider,name) \ - _SDT_ASM_STRING(provider) \ - _SDT_ASM_STRING(name) \ - pack_args args \ - _SDT_ASM_1(994: .balign 4) \ - _SDT_ASM_1( .popsection) - -#define _SDT_ASM_BASE \ - _SDT_ASM_1(.ifndef _.stapsdt.base) \ - _SDT_ASM_5( .pushsection .stapsdt.base,"aG","progbits", \ - .stapsdt.base,comdat) \ - _SDT_ASM_1( .weak _.stapsdt.base) \ - _SDT_ASM_1( .hidden _.stapsdt.base) \ - _SDT_ASM_1( _.stapsdt.base: .space 1) \ - _SDT_ASM_2( .size _.stapsdt.base, 1) \ - _SDT_ASM_1( .popsection) \ - _SDT_ASM_1(.endif) - -#if defined _SDT_HAS_SEMAPHORES -#define _SDT_SEMAPHORE(p,n) _SDT_ASM_1( _SDT_ASM_ADDR p##_##n##_semaphore) -#else -#define _SDT_SEMAPHORE(p,n) _SDT_ASM_1( _SDT_ASM_ADDR 0) -#endif - -#define _SDT_ASM_TEMPLATE_0 /* no arguments */ -#define _SDT_ASM_TEMPLATE_1 _SDT_ARGFMT(1) -#define _SDT_ASM_TEMPLATE_2 _SDT_ASM_TEMPLATE_1 _SDT_ARGFMT(2) -#define _SDT_ASM_TEMPLATE_3 _SDT_ASM_TEMPLATE_2 _SDT_ARGFMT(3) -#define _SDT_ASM_TEMPLATE_4 _SDT_ASM_TEMPLATE_3 _SDT_ARGFMT(4) -#define _SDT_ASM_TEMPLATE_5 _SDT_ASM_TEMPLATE_4 _SDT_ARGFMT(5) -#define _SDT_ASM_TEMPLATE_6 _SDT_ASM_TEMPLATE_5 _SDT_ARGFMT(6) -#define _SDT_ASM_TEMPLATE_7 _SDT_ASM_TEMPLATE_6 _SDT_ARGFMT(7) -#define _SDT_ASM_TEMPLATE_8 _SDT_ASM_TEMPLATE_7 _SDT_ARGFMT(8) -#define _SDT_ASM_TEMPLATE_9 _SDT_ASM_TEMPLATE_8 _SDT_ARGFMT(9) -#define _SDT_ASM_TEMPLATE_10 _SDT_ASM_TEMPLATE_9 _SDT_ARGFMT(10) -#define _SDT_ASM_TEMPLATE_11 _SDT_ASM_TEMPLATE_10 _SDT_ARGFMT(11) -#define _SDT_ASM_TEMPLATE_12 _SDT_ASM_TEMPLATE_11 _SDT_ARGFMT(12) -#define _SDT_ASM_OPERANDS_0() [__sdt_dummy] "g" (0) -#define _SDT_ASM_OPERANDS_1(arg1) _SDT_ARG(1, arg1) -#define _SDT_ASM_OPERANDS_2(arg1, arg2) \ - _SDT_ASM_OPERANDS_1(arg1), _SDT_ARG(2, arg2) -#define _SDT_ASM_OPERANDS_3(arg1, arg2, arg3) \ - _SDT_ASM_OPERANDS_2(arg1, arg2), _SDT_ARG(3, arg3) -#define _SDT_ASM_OPERANDS_4(arg1, arg2, arg3, arg4) \ - _SDT_ASM_OPERANDS_3(arg1, arg2, arg3), _SDT_ARG(4, arg4) -#define _SDT_ASM_OPERANDS_5(arg1, arg2, arg3, arg4, arg5) \ - _SDT_ASM_OPERANDS_4(arg1, arg2, arg3, arg4), _SDT_ARG(5, arg5) -#define _SDT_ASM_OPERANDS_6(arg1, arg2, arg3, arg4, arg5, arg6) \ - _SDT_ASM_OPERANDS_5(arg1, arg2, arg3, arg4, arg5), _SDT_ARG(6, arg6) -#define _SDT_ASM_OPERANDS_7(arg1, arg2, arg3, arg4, arg5, arg6, arg7) \ - _SDT_ASM_OPERANDS_6(arg1, arg2, arg3, arg4, arg5, arg6), _SDT_ARG(7, arg7) -#define _SDT_ASM_OPERANDS_8(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \ - _SDT_ASM_OPERANDS_7(arg1, arg2, arg3, arg4, arg5, arg6, arg7), \ - _SDT_ARG(8, arg8) -#define _SDT_ASM_OPERANDS_9(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) \ - _SDT_ASM_OPERANDS_8(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8), \ - _SDT_ARG(9, arg9) -#define _SDT_ASM_OPERANDS_10(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10) \ - _SDT_ASM_OPERANDS_9(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9), \ - _SDT_ARG(10, arg10) -#define _SDT_ASM_OPERANDS_11(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11) \ - _SDT_ASM_OPERANDS_10(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10), \ - _SDT_ARG(11, arg11) -#define _SDT_ASM_OPERANDS_12(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12) \ - _SDT_ASM_OPERANDS_11(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11), \ - _SDT_ARG(12, arg12) - -/* These macros can be used in C, C++, or assembly code. - In assembly code the arguments should use normal assembly operand syntax. */ - -#define STAP_PROBE(provider, name) \ - _SDT_PROBE(provider, name, 0, ()) -#define STAP_PROBE1(provider, name, arg1) \ - _SDT_PROBE(provider, name, 1, (arg1)) -#define STAP_PROBE2(provider, name, arg1, arg2) \ - _SDT_PROBE(provider, name, 2, (arg1, arg2)) -#define STAP_PROBE3(provider, name, arg1, arg2, arg3) \ - _SDT_PROBE(provider, name, 3, (arg1, arg2, arg3)) -#define STAP_PROBE4(provider, name, arg1, arg2, arg3, arg4) \ - _SDT_PROBE(provider, name, 4, (arg1, arg2, arg3, arg4)) -#define STAP_PROBE5(provider, name, arg1, arg2, arg3, arg4, arg5) \ - _SDT_PROBE(provider, name, 5, (arg1, arg2, arg3, arg4, arg5)) -#define STAP_PROBE6(provider, name, arg1, arg2, arg3, arg4, arg5, arg6) \ - _SDT_PROBE(provider, name, 6, (arg1, arg2, arg3, arg4, arg5, arg6)) -#define STAP_PROBE7(provider, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \ - _SDT_PROBE(provider, name, 7, (arg1, arg2, arg3, arg4, arg5, arg6, arg7)) -#define STAP_PROBE8(provider,name,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) \ - _SDT_PROBE(provider, name, 8, (arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)) -#define STAP_PROBE9(provider,name,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)\ - _SDT_PROBE(provider, name, 9, (arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)) -#define STAP_PROBE10(provider,name,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10) \ - _SDT_PROBE(provider, name, 10, \ - (arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10)) -#define STAP_PROBE11(provider,name,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11) \ - _SDT_PROBE(provider, name, 11, \ - (arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11)) -#define STAP_PROBE12(provider,name,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12) \ - _SDT_PROBE(provider, name, 12, \ - (arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12)) - -/* This STAP_PROBEV macro can be used in variadic scenarios, where the - number of probe arguments is not known until compile time. Since - variadic macro support may vary with compiler options, you must - pre-#define SDT_USE_VARIADIC to enable this type of probe. - - The trick to count __VA_ARGS__ was inspired by this post by - Laurent Deniau : - http://groups.google.com/group/comp.std.c/msg/346fc464319b1ee5 - - Note that our _SDT_NARG is called with an extra 0 arg that's not - counted, so we don't have to worry about the behavior of macros - called without any arguments. */ - -#ifdef SDT_USE_VARIADIC -#define _SDT_NARG(...) __SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0) -#define __SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N -#define _SDT_PROBE_N(provider, name, N, ...) \ - _SDT_PROBE(provider, name, N, (__VA_ARGS__)) -#define STAP_PROBEV(provider, name, ...) \ - _SDT_PROBE_N(provider, name, _SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__) -#endif - -/* These macros are for use in asm statements. You must compile - with -std=gnu99 or -std=c99 to use the STAP_PROBE_ASM macro. - - The STAP_PROBE_ASM macro generates a quoted string to be used in the - template portion of the asm statement, concatenated with strings that - contain the actual assembly code around the probe site. - - For example: - - asm ("before\n" - STAP_PROBE_ASM(provider, fooprobe, %eax 4(%esi)) - "after"); - - emits the assembly code for "before\nafter", with a probe in between. - The probe arguments are the %eax register, and the value of the memory - word located 4 bytes past the address in the %esi register. Note that - because this is a simple asm, not a GNU C extended asm statement, these - % characters do not need to be doubled to generate literal %reg names. - - In a GNU C extended asm statement, the probe arguments can be specified - using the macro STAP_PROBE_ASM_TEMPLATE(n) for n arguments. The paired - macro STAP_PROBE_ASM_OPERANDS gives the C values of these probe arguments, - and appears in the input operand list of the asm statement. For example: - - asm ("someinsn %0,%1\n" // %0 is output operand, %1 is input operand - STAP_PROBE_ASM(provider, fooprobe, STAP_PROBE_ASM_TEMPLATE(3)) - "otherinsn %[namedarg]" - : "r" (outvar) - : "g" (some_value), [namedarg] "i" (1234), - STAP_PROBE_ASM_OPERANDS(3, some_value, some_ptr->field, 1234)); - - This is just like writing: - - STAP_PROBE3(provider, fooprobe, some_value, some_ptr->field, 1234)); - - but the probe site is right between "someinsn" and "otherinsn". - - The probe arguments in STAP_PROBE_ASM can be given as assembly - operands instead, even inside a GNU C extended asm statement. - Note that these can use operand templates like %0 or %[name], - and likewise they must write %%reg for a literal operand of %reg. */ - -#if __STDC_VERSION__ >= 199901L -# define STAP_PROBE_ASM(provider, name, ...) \ - _SDT_ASM_BODY(provider, name, _SDT_ASM_STRING, (__VA_ARGS__)) \ - _SDT_ASM_BASE -# define STAP_PROBE_ASM_OPERANDS(n, ...) _SDT_ASM_OPERANDS_##n(__VA_ARGS__) -#else -# define STAP_PROBE_ASM(provider, name, args) \ - _SDT_ASM_BODY(provider, name, _SDT_ASM_STRING, (args)) \ - _SDT_ASM_BASE -#endif -#define STAP_PROBE_ASM_TEMPLATE(n) _SDT_ASM_TEMPLATE_##n - - -/* DTrace compatible macro names. */ -#define DTRACE_PROBE(provider,probe) \ - STAP_PROBE(provider,probe) -#define DTRACE_PROBE1(provider,probe,parm1) \ - STAP_PROBE1(provider,probe,parm1) -#define DTRACE_PROBE2(provider,probe,parm1,parm2) \ - STAP_PROBE2(provider,probe,parm1,parm2) -#define DTRACE_PROBE3(provider,probe,parm1,parm2,parm3) \ - STAP_PROBE3(provider,probe,parm1,parm2,parm3) -#define DTRACE_PROBE4(provider,probe,parm1,parm2,parm3,parm4) \ - STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4) -#define DTRACE_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) \ - STAP_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) -#define DTRACE_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) \ - STAP_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) -#define DTRACE_PROBE7(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7) \ - STAP_PROBE7(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7) -#define DTRACE_PROBE8(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) \ - STAP_PROBE8(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) -#define DTRACE_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ - STAP_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) -#define DTRACE_PROBE10(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10) \ - STAP_PROBE10(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10) -#define DTRACE_PROBE11(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10,parm11) \ - STAP_PROBE11(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10,parm11) -#define DTRACE_PROBE12(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10,parm11,parm12) \ - STAP_PROBE12(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10,parm11,parm12) - - -#endif /* sys/sdt.h */