The package rpms/glibc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=5163dbee4558....
Change:
+%ifarch %{ix86} aarch64
Thanks.
Full change:
============
commit 0f4d3ed14dc9efb1dfb9528f31d9e630c0ab4679
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Fri Jan 19 12:58:39 2018 +0100
Auto-sync with upstream branch master
Upstream commit: 64f63cb4583ecc1ba16c7253aacc192b6d088511
- Enable static PIE support
- Remove add-on support (already gone upstream)
- Rework test suite status reporting
- malloc: Fix integer overflows in memalign and malloc functions (swbz#22343)
- x86-64: Properly align La_x86_64_retval to VEC_SIZE (swbz#22715)
- aarch64: Update bits/hwcap.h for Linux 4.15
- Add NT_ARM_SVE to elf.h
diff --git a/glibc.spec b/glibc.spec
index 1831bc0..af08df2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.26.9000-1125-g860b0240a5
+%define glibcsrcdir glibc-2.26.9000-1139-g64f63cb458
%define glibcversion 2.26.9000
-%define glibcrelease 42%{?dist}
+%define glibcrelease 43%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@@ -2051,6 +2051,17 @@ fi
%endif
%changelog
+* Fri Jan 19 2018 Florian Weimer <fweimer(a)redhat.com> - 2.26.9000-43
+- Enable static PIE support
+- Remove add-on support (already gone upstream)
+- Rework test suite status reporting
+- Auto-sync with upstream branch master,
+ commit 64f63cb4583ecc1ba16c7253aacc192b6d088511:
+- malloc: Fix integer overflows in memalign and malloc functions (swbz#22343)
+- x86-64: Properly align La_x86_64_retval to VEC_SIZE (swbz#22715)
+- aarch64: Update bits/hwcap.h for Linux 4.15
+- Add NT_ARM_SVE to elf.h
+
* Wed Jan 17 2018 Florian Weimer <fweimer(a)redhat.com> - 2.26.9000-42
- CVE-2017-14062, CVE-2016-6261, CVE-2016-6263:
Use libidn2 for IDNA support (#1452750)
commit 5c2fe5cfb3798d359719b9b7da5e1324ef100709
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Fri Jan 19 12:02:32 2018 +0100
Rework test suite status reporting
Remove the timeout and the parallel tail call. Always output to
standard error, for synchronization with the rest of the reporting.
diff --git a/glibc.spec b/glibc.spec
index 38c334a..1831bc0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1742,54 +1742,43 @@ truncate -s 0 $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
%check
%if %{with testsuite}
-# Run the glibc tests. If any tests fail to build we exit %check with an error
-# of 1, otherwise we print the test failure list and the failed test output
-# and exit with 0. In the future we want to compare against a baseline and
-# exit with 1 if the results deviate from the baseline.
+# Run the glibc tests. If any tests fail to build we exit %check with
+# an error, otherwise we print the test failure list and the failed
+# test output and continue. Write to standard error to avoid
+# synchronization issues with make and shell tracing output if
+# standard output and standard error are different pipes.
run_tests () {
- truncate -s 0 check.log
- tail -f check.log &
- tailpid=$!
- # Run the make a sub-shell (to avoid %check failing if make fails)
- # but capture the status for use later. We use the normal sub-shell
- # trick of printing the status. The actual result of the sub-shell
- # is the successful execution of the echo.
- status=$(set +e
- make %{?_smp_mflags} -O check > check.log 2>&1
- status=$?
- echo $status)
- # Wait for the tail to catch up with the output and then kill it.
- sleep 10
- kill $tailpid
- # Print the header, so we can find it, but skip the error printing
- # if there aren't any failrues.
- echo ===================FAILED TESTS=====================
- if [ $status -ne 0 ]; then
- # We are not running with `-k`, therefore a test build failure
- # terminates the test run and that terminates %check with an
- # error which terminates the build. We want this behaviour to
- # ensure that all tests build, and all tests run.
- # If the test result summary is not present it means one of
- # tests failed to build.
- if ! grep 'Summary of test results:' check.log; then
- echo "FAIL: Some glibc tests failed to build."
- exit 1
- fi
-
- # Print out information about all of the failed tests.
- grep -e ^FAIL -e ^ERROR tests.sum \
- | awk '{print $2}' \
- | while read testcase;
- do
- echo "$testcase"
- cat $testcase.out
- echo -------------------------
- done
- fi
-
- # Unconditonally dump differences in the system call list.
- echo "* System call consistency checks:"
- cat misc/tst-syscall-list.out
+ # This hides a test suite build failure, which should be fatal. We
+ # check "Summary of test results:" below to verify that all tests
+ # were built and run.
+ make %{?_smp_mflags} -O check |& tee rpmbuild.check.log >&2
+ test -n tests.sum
+ if ! grep -q '^Summary of test results:$' rpmbuild.check.log ; then
+ echo "FAIL: test suite build of target: $(basename "$(pwd)")"
>& 2
+ exit 1
+ fi
+ set +x
+ grep -v ^PASS: tests.sum > rpmbuild.tests.sum.not-passing || true
+ if test -n rpmbuild.tests.sum.not-passing ; then
+ echo ===================FAILED TESTS===================== >&2
+ echo "Target: $(basename "$(pwd)")" >& 2
+ cat rpmbuild.tests.sum.not-passing >&2
+ while read failed_code failed_test ; do
+ for suffix in out test-result ; do
+ if test -e "$failed_test.$suffix"; then
+ echo >&2
+ echo "=====$failed_code $failed_test.$suffix=====" >&2
+ cat -- "$failed_test.$suffix" >&2
+ echo >&2
+ fi
+ done
+ done <rpmbuild.tests.sum.not-passing
+ fi
+
+ # Unconditonally dump differences in the system call list.
+ echo "* System call consistency checks:" >&2
+ cat misc/tst-syscall-list.out >&2
+ set -x
}
# Increase timeouts
@@ -1798,7 +1787,7 @@ parent=$$
echo ====================TESTING=========================
##############################################################################
# - Test the default runtime.
-# - Power 620 / 970 ISA for 64-bit POWER BE.
+# - Power 620 / 970 ISA for 64-bit POWER BE.
# - POWER8 for 64-bit POWER LE.
# - ??? for 64-bit x86_64
# - ??? for 32-bit x86
@@ -1844,12 +1833,6 @@ run_tests
popd
%endif
-echo ====================TESTING DETAILS=================
-for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p'
build-*-linux*/check.log`; do
- echo =====$i=====
- cat $i || :
- echo ============
-done
echo ====================TESTING END=====================
PLTCMD='/^Relocation section .*\(\.rela\?\.plt\|\.rela\.IA_64\.pltoff\)/,/^$/p'
echo ====================PLT RELOCS LD.SO================
commit 5163dbee45584c74025497b8f760c3ee94049f1f
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Fri Jan 19 08:36:02 2018 +0100
Enable static PIE on aarch64, i686, x86-64
diff --git a/glibc.spec b/glibc.spec
index 9b534ea..38c334a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -931,6 +931,9 @@ build()
--enable-bind-now \
--build=%{target} \
--enable-stack-protector=strong \
+%ifarch %{ix86} aarch64
+ --enable-static-pie \
+%endif
--enable-tunables \
--enable-systemtap \
${core_with_options} \
commit dc905411d5b45d40e511063a5a1624b4cc5ac2a5
Author: Florian Weimer <fweimer(a)redhat.com>
Date: Fri Jan 19 08:35:09 2018 +0100
Remove add-on support (already gone upstream)
diff --git a/glibc.spec b/glibc.spec
index 4e5ba15..9b534ea 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -903,14 +903,13 @@ EnableKernel="--enable-kernel=%{enablekernel}"
# Save the used compiler and options into the file "Gcc" for use later
# by %%install.
echo "$GCC" > Gcc
-AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|powerpc-cpu\)\(
\|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
##############################################################################
# build()
# Build glibc in `build-%{target}$1', passing the rest of the arguments
# as CFLAGS to the build (not the same as configure CFLAGS). Several
-# global values are used to determine build flags, add-ons, kernel
-# version, system tap support, etc.
+# global values are used to determine build flags, kernel version,
+# system tap support, etc.
##############################################################################
build()
{
@@ -928,7 +927,6 @@ build()
configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
../configure CC="$GCC" CXX="$GXX"
CFLAGS="$configure_CFLAGS" \
--prefix=%{_prefix} \
- --enable-add-ons=$AddOns \
--with-headers=%{_prefix}/include $EnableKernel \
--enable-bind-now \
--build=%{target} \