diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | fedora/branch.mk | 4 | ||||
-rw-r--r-- | fedora/glibc.spec.in | 21 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sigaction.c | 3 |
4 files changed, 27 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> + + * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with + libgcc not supporting `rflags' unwinding (register # >= 17). + 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc diff --git a/fedora/branch.mk b/fedora/branch.mk index 543abeec18..944a694568 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc7 -fedora-sync-date := 2006-11-30 16:52 UTC -fedora-sync-tag := fedora-glibc-20061130T1652 +fedora-sync-date := 2006-12-01 08:21 UTC +fedora-sync-tag := fedora-glibc-20061201T0821 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index bd15991389..cf2b095fdb 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 9 +%define glibcrelease 10 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -940,7 +940,7 @@ cd .. %if %{buildpower6} cd build-%{nptl_target_cpu}-linuxnptl-power6 -mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6/ +mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6{,x} cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*` cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` @@ -953,10 +953,18 @@ cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_li ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` +pushd $RPM_BUILD_ROOT/%{_lib}/power6x +ln -sf ../power6/*.so . +cp -a ../power6/*.so.* . +popd %ifarch %{rtkaioarches} -mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6 +mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6{,x} cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso +pushd $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6x +ln -sf ../power6/*.so . +cp -a ../power6/*.so.* . +popd %endif cd .. %endif @@ -1447,8 +1455,10 @@ rm -f *.filelist* %endif %if %{buildpower6} %dir /%{_lib}/power6 +%dir /%{_lib}/power6x %ifarch %{rtkaioarches} %dir /%{_lib}/rtkaio/power6 +%dir /%{_lib}/rtkaio/power6x %endif %endif %ifarch s390x @@ -1534,6 +1544,9 @@ rm -f *.filelist* %endif %changelog +* Fri Dec 1 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-10 +- fix x86-64 restore_rt unwind info + * Thu Nov 30 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-9 - fix last svc_run change (#217850) - on ppc64 build __libc_start_main without unwind info, @@ -1542,6 +1555,8 @@ rm -f *.filelist* in __libc_start_main instead) - add unwind info for x86-64 restore_rt signal return landing pad (#217087) +- add power6x subdir to /%{_lib}/ and /%{_lib}/rtkaio/, + link all libs from ../power6/* into them * Tue Nov 28 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-8 - fix svc_run (#216834, BZ#3559) diff --git a/sysdeps/unix/sysv/linux/x86_64/sigaction.c b/sysdeps/unix/sysv/linux/x86_64/sigaction.c index 0d56364ab7..ab10123858 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sigaction.c +++ b/sysdeps/unix/sysv/linux/x86_64/sigaction.c @@ -174,7 +174,8 @@ asm \ do_expr (2 /* rcx */, oRCX) \ do_expr (7 /* rsp */, oRSP) \ do_expr (16 /* rip */, oRIP) \ - do_expr (49 /* rflags */, oEFL) \ + /* libgcc-4.1.1 has only `DWARF_FRAME_REGISTERS == 17'. */ \ + /* do_expr (49 |* rflags *|, oEFL) */ \ /* `cs'/`ds'/`fs' are unaligned and a different size. */ \ /* gas: Error: register save offset not a multiple of 8 */ \ " .align 8\n" \ |