[arch-commits] Commit in rkt/repos/community-x86_64 (6 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Jul 31 09:05:07 UTC 2017
Date: Monday, July 31, 2017 @ 09:05:07
Author: mtorromeo
Revision: 247124
archrelease: copy trunk to community-x86_64
Added:
rkt/repos/community-x86_64/PKGBUILD
(from rev 247123, rkt/trunk/PKGBUILD)
rkt/repos/community-x86_64/ilog2.patch
(from rev 247123, rkt/trunk/ilog2.patch)
rkt/repos/community-x86_64/rkt.sysusers
(from rev 247123, rkt/trunk/rkt.sysusers)
Deleted:
rkt/repos/community-x86_64/PKGBUILD
rkt/repos/community-x86_64/ilog2.patch
rkt/repos/community-x86_64/rkt.sysusers
--------------+
PKGBUILD | 254 ++++++++++++++++++++++++++++-----------------------------
ilog2.patch | 252 ++++++++++++++++++++++++++++----------------------------
rkt.sysusers | 4
3 files changed, 257 insertions(+), 253 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-31 09:04:46 UTC (rev 247123)
+++ PKGBUILD 2017-07-31 09:05:07 UTC (rev 247124)
@@ -1,125 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-# Contributor: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
-# Contributor: Kenny Rasschaert <kenny dot rasschaert at gmail dot com> PGP-Key: 1F70454121E41419
-# Contributor: Adrián Pérez de Castro <adrian at perezdecastro dor org> PGP-Key: 91C559DBE4C9123B
-# Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
-
-pkgname=rkt
-pkgver=1.27.0
-pkgrel=1
-pkgdesc="App container runtime"
-arch=('x86_64')
-url="https://github.com/coreos/rkt"
-license=(apache)
-depends=('glibc' 'openssl' 'zlib' 'systemd')
-makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny'
- 'intltool' 'gperf' 'git' 'libseccomp' 'bc' 'python2')
-
-# stage1/usr_from_coreos/coreos-common.mk
-CCN_IMG_RELEASE=1235.0.0
-CCN_SYSTEMD_VERSION=v231
-
-# stage1/usr_from_kvm/kernel.mk
-KERNEL_VERSION=4.9.2
-
-# stage1/usr_from_kvm/lkvm.mk
-KVMTOOL_VERSION=cfae4d64482ed745214e3c62dd84b79c2ae0f325
-
-source=(https://github.com/coreos/rkt/archive/v$pkgver/$pkgname-$pkgver.tar.gz
- coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz
- coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz.sig::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz.sig
- https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz
- kvmtool-$KVMTOOL_VERSION.tar.gz::https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/$KVMTOOL_VERSION.tar.gz
- rkt.sysusers
- ilog2.patch)
-noextract=(coreos_production_pxe_image.cpio.gz
- kvmtool-$KVMTOOL_VERSION.tar.gz)
-validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' '48F9B96A2E16137F')
-sha256sums=('213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1'
- '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
- 'SKIP'
- '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
- 'b531d7247319ed4fba1f3d8b8fc4025762611d14ef5412a61d2ed8f32f58f5cb'
- '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6'
- '4b836472870b94f74294752af259751ce87bc0c53a3d40f93a70da3bf6512bdf')
-
-prepare() {
- cd "$srcdir"/$pkgname-$pkgver
- mkdir -p build-rkt-$pkgver/tmp/usr_from_kvm/{lkvm/src,kernel}
-
- # disable git fetch of kvmtool
- sed -r '/^include makelib\/git.mk$/d' -i stage1/usr_from_kvm/lkvm.mk
- bsdtar -xf "$srcdir"/kvmtool-$KVMTOOL_VERSION.tar.gz \
- -C build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src
-
- # fix makedev definition
- sed '/^#include <sys\/stat.h>$/a #include <sys/sysmacros.h>' -i \
- build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src/virtio/9p.c
-
- # do not extract kernel sources
- sed '/^\$(call forward-vars,\$(KERNEL_MAKEFILE)/,/tar --extract/d' -i \
- stage1/usr_from_kvm/kernel.mk
-
- # place prefetched kernel sources
- ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz \
- build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
- ln -s "$srcdir"/linux-$KERNEL_VERSION \
- build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
-
- cd build-rkt-$pkgver/tmp/usr_from_kvm/kernel/linux-$KERNEL_VERSION
- patch -p1 -i "$srcdir"/ilog2.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- export GOPATH="$PWD/Godeps/_workspace/src"
-
- ./autogen.sh
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --enable-tpm=auto \
- --with-stage1-flavors=coreos,kvm,host,fly \
- --with-stage1-kvm-hypervisors=lkvm \
- --with-stage1-default-flavor=host \
- --with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
- --with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-host.aci \
- --with-coreos-local-pxe-image-path="$srcdir"/coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz \
- --with-coreos-local-pxe-image-systemd-version=$CCN_SYSTEMD_VERSION
-
- make manpages
- make bash-completion
- make
-}
-
-package() {
- cd $pkgname-$pkgver/dist/init/systemd
-
- for unit in *.service *.timer *.socket; do
- install -Dm644 $unit "$pkgdir"/usr/lib/systemd/system/$unit
- done
-
- for tmpfile in tmpfiles.d/*.conf; do
- install -Dm644 $tmpfile "$pkgdir"/usr/lib/$tmpfile
- done
-
- cd "$srcdir"/$pkgname-$pkgver
- install -Dm644 "$srcdir"/rkt.sysusers "$pkgdir"/usr/lib/sysusers.d/rkt.conf
- install -Dm644 dist/bash_completion/rkt.bash "$pkgdir"/usr/share/bash-completion/completions/rkt
-
- cd dist/manpages
- for f in *; do
- install -Dm644 "$f" "$pkgdir/usr/share/man/man1/$f"
- done
- cd ../..
-
- cd build-$pkgname-$pkgver
- install -dm755 "$pkgdir"/usr/bin "$pkgdir"/usr/lib/rkt/stage1-images
- mv target/bin/rkt tools/actool "$pkgdir"/usr/bin
- mv target/bin/stage1-*.aci "$pkgdir"/usr/lib/rkt/stage1-images/
-}
-
-# vim:set ts=2 sw=2 et:
Copied: rkt/repos/community-x86_64/PKGBUILD (from rev 247123, rkt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-31 09:05:07 UTC (rev 247124)
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+# Contributor: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
+# Contributor: Kenny Rasschaert <kenny dot rasschaert at gmail dot com> PGP-Key: 1F70454121E41419
+# Contributor: Adrián Pérez de Castro <adrian at perezdecastro dor org> PGP-Key: 91C559DBE4C9123B
+# Contributor: Carl George <arch at cgtx dot us> PGP-Key: 4BA2F7E101D9F512
+
+pkgname=rkt
+pkgver=1.28.0
+pkgrel=1
+pkgdesc="App container runtime"
+arch=('x86_64')
+url="https://github.com/coreos/rkt"
+license=(apache)
+depends=('glibc' 'openssl' 'zlib' 'systemd')
+makedepends=('cpio' 'go' 'wget' 'squashfs-tools' 'perl-capture-tiny'
+ 'intltool' 'gperf' 'git' 'libseccomp' 'bc' 'python2')
+
+# stage1/usr_from_coreos/coreos-common.mk
+CCN_IMG_RELEASE=1235.0.0
+CCN_SYSTEMD_VERSION=v231
+
+# stage1/usr_from_kvm/kernel.mk
+KERNEL_VERSION=4.9.2
+
+# stage1/usr_from_kvm/lkvm.mk
+KVMTOOL_VERSION=cfae4d64482ed745214e3c62dd84b79c2ae0f325
+
+source=(https://github.com/coreos/rkt/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+ coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz
+ coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz.sig::http://alpha.release.core-os.net/amd64-usr/$CCN_IMG_RELEASE/coreos_production_pxe_image.cpio.gz.sig
+ https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz
+ https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.sign
+ kvmtool-$KVMTOOL_VERSION.tar.gz::https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/$KVMTOOL_VERSION.tar.gz
+ rkt.sysusers
+ ilog2.patch)
+noextract=(coreos_production_pxe_image.cpio.gz
+ kvmtool-$KVMTOOL_VERSION.tar.gz)
+validpgpkeys=('04127D0BFABEC8871FFB2CCE50E0885593D2DCB4' # CoreOS Buildbot
+ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
+ )
+sha256sums=('c148388420e2620111d187985fc30856c8bfb26cd8fcd8988594847dbc09f7e3'
+ '988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315'
+ 'SKIP'
+ '8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738'
+ 'SKIP'
+ 'd827b98909d3ec6ddf0b0221ee7b89568e3d0b0333c2214f36a480c67fa53709'
+ '2aee4e8547843f4e6c032761b97cb723c1ecd384d508b86f44d16826bc34d6d6'
+ '4b836472870b94f74294752af259751ce87bc0c53a3d40f93a70da3bf6512bdf')
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ mkdir -p build-rkt-$pkgver/tmp/usr_from_kvm/{lkvm/src,kernel}
+
+ # disable git fetch of kvmtool
+ sed -r '/^include makelib\/git.mk$/d' -i stage1/usr_from_kvm/lkvm.mk
+ bsdtar -xf "$srcdir"/kvmtool-$KVMTOOL_VERSION.tar.gz \
+ -C build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src
+
+ # fix makedev definition
+ sed '/^#include <sys\/stat.h>$/a #include <sys/sysmacros.h>' -i \
+ build-rkt-$pkgver/tmp/usr_from_kvm/lkvm/src/virtio/9p.c
+
+ # do not extract kernel sources
+ sed '/^\$(call forward-vars,\$(KERNEL_MAKEFILE)/,/tar --extract/d' -i \
+ stage1/usr_from_kvm/kernel.mk
+
+ # place prefetched kernel sources
+ ln -s "$srcdir"/linux-$KERNEL_VERSION.tar.xz \
+ build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+ ln -s "$srcdir"/linux-$KERNEL_VERSION \
+ build-rkt-$pkgver/tmp/usr_from_kvm/kernel/
+
+ cd build-rkt-$pkgver/tmp/usr_from_kvm/kernel/linux-$KERNEL_VERSION
+ patch -p1 -i "$srcdir"/ilog2.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export GOPATH="$PWD/Godeps/_workspace/src"
+
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --enable-tpm=auto \
+ --with-stage1-flavors=coreos,kvm,host,fly \
+ --with-stage1-kvm-hypervisors=lkvm \
+ --with-stage1-default-flavor=host \
+ --with-stage1-default-images-directory=/usr/lib/rkt/stage1-images \
+ --with-stage1-default-location=/usr/lib/rkt/stage1-images/stage1-host.aci \
+ --with-coreos-local-pxe-image-path="$srcdir"/coreos_production_pxe_image-$CCN_IMG_RELEASE.cpio.gz \
+ --with-coreos-local-pxe-image-systemd-version=$CCN_SYSTEMD_VERSION
+
+ make manpages
+ make bash-completion
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/dist/init/systemd
+
+ for unit in *.service *.timer *.socket; do
+ install -Dm644 $unit "$pkgdir"/usr/lib/systemd/system/$unit
+ done
+
+ for tmpfile in tmpfiles.d/*.conf; do
+ install -Dm644 $tmpfile "$pkgdir"/usr/lib/$tmpfile
+ done
+
+ cd "$srcdir"/$pkgname-$pkgver
+ install -Dm644 "$srcdir"/rkt.sysusers "$pkgdir"/usr/lib/sysusers.d/rkt.conf
+ install -Dm644 dist/bash_completion/rkt.bash "$pkgdir"/usr/share/bash-completion/completions/rkt
+
+ cd dist/manpages
+ for f in *; do
+ install -Dm644 "$f" "$pkgdir/usr/share/man/man1/$f"
+ done
+ cd ../..
+
+ cd build-$pkgname-$pkgver
+ install -dm755 "$pkgdir"/usr/bin "$pkgdir"/usr/lib/rkt/stage1-images
+ mv target/bin/rkt tools/actool "$pkgdir"/usr/bin
+ mv target/bin/stage1-*.aci "$pkgdir"/usr/lib/rkt/stage1-images/
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: ilog2.patch
===================================================================
--- ilog2.patch 2017-07-31 09:04:46 UTC (rev 247123)
+++ ilog2.patch 2017-07-31 09:05:07 UTC (rev 247124)
@@ -1,126 +0,0 @@
-From 474c90156c8dcc2fa815e6716cc9394d7930cb9c Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds at linux-foundation.org>
-Date: Thu, 2 Mar 2017 12:17:22 -0800
-Subject: give up on gcc ilog2() constant optimizations
-
-gcc-7 has an "optimization" pass that completely screws up, and
-generates the code expansion for the (impossible) case of calling
-ilog2() with a zero constant, even when the code gcc compiles does not
-actually have a zero constant.
-
-And we try to generate a compile-time error for anybody doing ilog2() on
-a constant where that doesn't make sense (be it zero or negative). So
-now gcc7 will fail the build due to our sanity checking, because it
-created that constant-zero case that didn't actually exist in the source
-code.
-
-There's a whole long discussion on the kernel mailing about how to work
-around this gcc bug. The gcc people themselevs have discussed their
-"feature" in
-
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
-
-but it's all water under the bridge, because while it looked at one
-point like it would be solved by the time gcc7 was released, that was
-not to be.
-
-So now we have to deal with this compiler braindamage.
-
-And the only simple approach seems to be to just delete the code that
-tries to warn about bad uses of ilog2().
-
-So now "ilog2()" will just return 0 not just for the value 1, but for
-any non-positive value too.
-
-It's not like I can recall anybody having ever actually tried to use
-this function on any invalid value, but maybe the sanity check just
-meant that such code never made it out in public.
-
-Reported-by: Laura Abbott <labbott at redhat.com>
-Cc: John Stultz <john.stultz at linaro.org>,
-Cc: Thomas Gleixner <tglx at linutronix.de>
-Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
----
- include/linux/log2.h | 13 ++-----------
- tools/include/linux/log2.h | 13 ++-----------
- 2 files changed, 4 insertions(+), 22 deletions(-)
-
-diff --git a/include/linux/log2.h b/include/linux/log2.h
-index ef3d4f6..c373295 100644
---- a/include/linux/log2.h
-+++ b/include/linux/log2.h
-@@ -16,12 +16,6 @@
- #include <linux/bitops.h>
-
- /*
-- * deal with unrepresentable constant logarithms
-- */
--extern __attribute__((const, noreturn))
--int ____ilog2_NaN(void);
--
--/*
- * non-constant log of base 2 calculators
- * - the arch may override these in asm/bitops.h if they can be implemented
- * more efficiently than using fls() and fls64()
-@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
- #define ilog2(n) \
- ( \
- __builtin_constant_p(n) ? ( \
-- (n) < 1 ? ____ilog2_NaN() : \
-+ (n) < 2 ? 0 : \
- (n) & (1ULL << 63) ? 63 : \
- (n) & (1ULL << 62) ? 62 : \
- (n) & (1ULL << 61) ? 61 : \
-@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
- (n) & (1ULL << 4) ? 4 : \
- (n) & (1ULL << 3) ? 3 : \
- (n) & (1ULL << 2) ? 2 : \
-- (n) & (1ULL << 1) ? 1 : \
-- (n) & (1ULL << 0) ? 0 : \
-- ____ilog2_NaN() \
-- ) : \
-+ 1 ) : \
- (sizeof(n) <= 4) ? \
- __ilog2_u32(n) : \
- __ilog2_u64(n) \
-diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h
-index 4144666..d5677d3 100644
---- a/tools/include/linux/log2.h
-+++ b/tools/include/linux/log2.h
-@@ -13,12 +13,6 @@
- #define _TOOLS_LINUX_LOG2_H
-
- /*
-- * deal with unrepresentable constant logarithms
-- */
--extern __attribute__((const, noreturn))
--int ____ilog2_NaN(void);
--
--/*
- * non-constant log of base 2 calculators
- * - the arch may override these in asm/bitops.h if they can be implemented
- * more efficiently than using fls() and fls64()
-@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
- #define ilog2(n) \
- ( \
- __builtin_constant_p(n) ? ( \
-- (n) < 1 ? ____ilog2_NaN() : \
-+ (n) < 2 ? 0 : \
- (n) & (1ULL << 63) ? 63 : \
- (n) & (1ULL << 62) ? 62 : \
- (n) & (1ULL << 61) ? 61 : \
-@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
- (n) & (1ULL << 4) ? 4 : \
- (n) & (1ULL << 3) ? 3 : \
- (n) & (1ULL << 2) ? 2 : \
-- (n) & (1ULL << 1) ? 1 : \
-- (n) & (1ULL << 0) ? 0 : \
-- ____ilog2_NaN() \
-- ) : \
-+ 1 ) : \
- (sizeof(n) <= 4) ? \
- __ilog2_u32(n) : \
- __ilog2_u64(n) \
---
-cgit v1.1
Copied: rkt/repos/community-x86_64/ilog2.patch (from rev 247123, rkt/trunk/ilog2.patch)
===================================================================
--- ilog2.patch (rev 0)
+++ ilog2.patch 2017-07-31 09:05:07 UTC (rev 247124)
@@ -0,0 +1,126 @@
+From 474c90156c8dcc2fa815e6716cc9394d7930cb9c Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Thu, 2 Mar 2017 12:17:22 -0800
+Subject: give up on gcc ilog2() constant optimizations
+
+gcc-7 has an "optimization" pass that completely screws up, and
+generates the code expansion for the (impossible) case of calling
+ilog2() with a zero constant, even when the code gcc compiles does not
+actually have a zero constant.
+
+And we try to generate a compile-time error for anybody doing ilog2() on
+a constant where that doesn't make sense (be it zero or negative). So
+now gcc7 will fail the build due to our sanity checking, because it
+created that constant-zero case that didn't actually exist in the source
+code.
+
+There's a whole long discussion on the kernel mailing about how to work
+around this gcc bug. The gcc people themselevs have discussed their
+"feature" in
+
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
+
+but it's all water under the bridge, because while it looked at one
+point like it would be solved by the time gcc7 was released, that was
+not to be.
+
+So now we have to deal with this compiler braindamage.
+
+And the only simple approach seems to be to just delete the code that
+tries to warn about bad uses of ilog2().
+
+So now "ilog2()" will just return 0 not just for the value 1, but for
+any non-positive value too.
+
+It's not like I can recall anybody having ever actually tried to use
+this function on any invalid value, but maybe the sanity check just
+meant that such code never made it out in public.
+
+Reported-by: Laura Abbott <labbott at redhat.com>
+Cc: John Stultz <john.stultz at linaro.org>,
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ include/linux/log2.h | 13 ++-----------
+ tools/include/linux/log2.h | 13 ++-----------
+ 2 files changed, 4 insertions(+), 22 deletions(-)
+
+diff --git a/include/linux/log2.h b/include/linux/log2.h
+index ef3d4f6..c373295 100644
+--- a/include/linux/log2.h
++++ b/include/linux/log2.h
+@@ -16,12 +16,6 @@
+ #include <linux/bitops.h>
+
+ /*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+-/*
+ * non-constant log of base 2 calculators
+ * - the arch may override these in asm/bitops.h if they can be implemented
+ * more efficiently than using fls() and fls64()
+@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n) \
+ ( \
+ __builtin_constant_p(n) ? ( \
+- (n) < 1 ? ____ilog2_NaN() : \
++ (n) < 2 ? 0 : \
+ (n) & (1ULL << 63) ? 63 : \
+ (n) & (1ULL << 62) ? 62 : \
+ (n) & (1ULL << 61) ? 61 : \
+@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ (n) & (1ULL << 4) ? 4 : \
+ (n) & (1ULL << 3) ? 3 : \
+ (n) & (1ULL << 2) ? 2 : \
+- (n) & (1ULL << 1) ? 1 : \
+- (n) & (1ULL << 0) ? 0 : \
+- ____ilog2_NaN() \
+- ) : \
++ 1 ) : \
+ (sizeof(n) <= 4) ? \
+ __ilog2_u32(n) : \
+ __ilog2_u64(n) \
+diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h
+index 4144666..d5677d3 100644
+--- a/tools/include/linux/log2.h
++++ b/tools/include/linux/log2.h
+@@ -13,12 +13,6 @@
+ #define _TOOLS_LINUX_LOG2_H
+
+ /*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+-/*
+ * non-constant log of base 2 calculators
+ * - the arch may override these in asm/bitops.h if they can be implemented
+ * more efficiently than using fls() and fls64()
+@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n) \
+ ( \
+ __builtin_constant_p(n) ? ( \
+- (n) < 1 ? ____ilog2_NaN() : \
++ (n) < 2 ? 0 : \
+ (n) & (1ULL << 63) ? 63 : \
+ (n) & (1ULL << 62) ? 62 : \
+ (n) & (1ULL << 61) ? 61 : \
+@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ (n) & (1ULL << 4) ? 4 : \
+ (n) & (1ULL << 3) ? 3 : \
+ (n) & (1ULL << 2) ? 2 : \
+- (n) & (1ULL << 1) ? 1 : \
+- (n) & (1ULL << 0) ? 0 : \
+- ____ilog2_NaN() \
+- ) : \
++ 1 ) : \
+ (sizeof(n) <= 4) ? \
+ __ilog2_u32(n) : \
+ __ilog2_u64(n) \
+--
+cgit v1.1
Deleted: rkt.sysusers
===================================================================
--- rkt.sysusers 2017-07-31 09:04:46 UTC (rev 247123)
+++ rkt.sysusers 2017-07-31 09:05:07 UTC (rev 247124)
@@ -1,2 +0,0 @@
-g rkt - -
-g rkt-admin - -
Copied: rkt/repos/community-x86_64/rkt.sysusers (from rev 247123, rkt/trunk/rkt.sysusers)
===================================================================
--- rkt.sysusers (rev 0)
+++ rkt.sysusers 2017-07-31 09:05:07 UTC (rev 247124)
@@ -0,0 +1,2 @@
+g rkt - -
+g rkt-admin - -
More information about the arch-commits
mailing list