~ubuntu-branches/ubuntu/utopic/eglibc/utopic

« back to all changes in this revision

Viewing changes to debian/patches/s390/cvs-vsyscalls.diff

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2012-10-26 05:14:58 UTC
  • mfrom: (1.5.1) (4.4.22 experimental)
  • Revision ID: package-import@ubuntu.com-20121026051458-oryotr4i03ob5pab
Tags: 2.16-0ubuntu1
* Merge with unreleased 2.16 in Debian experimental, remaining changes:
  - Drop the Breaks line from libc6, which refers to a Debian transition
  - Remove the libc6 recommends on libc6-i686, which we don't build
  - Enable libc6{,-dev}-armel on armhf and libc6{-dev}-armhf on armel
  - Ship update-locale and validlocale in /usr/sbin in libc-bin
  - Don't build locales or locales-all in Ubuntu, we rely on langpacks
  - Heavily mangle the way we do service restarting on major upgrades
  - Use different MIN_KERNEL_SUPPORTED versions than Debian, due to
    buildd needs.  This should be universally bumped to 3.2.0 once all
    our buildds (including the PPA guests) are running precise kernels
  - Build i386 variants as -march=i686, build amd64 with -O3, and build
    ppc64 variants (both 64-bit and 32-bit) with -O3 -fno-tree-vectorize
  - Re-enable unsubmitted-ldconfig-cache-abi.diff and rebuild the cache
    on upgrades from previous versions that used a different constant
  - debian/patches/any/local-CVE-2012-3406.diff: switch to malloc when
    array grows too large to handle via alloca extension (CVE-2012-3406)
  - Build generic i386/i686 flavour with -mno-tls-direct-seg-refs
* Changes added/dropped with this merge while reducing our delta:
  - Stop building glibc docs from the eglibc source, and instead make
    the glibc-docs stub have a hard dependency on glibc-doc-reference
  - Remove outdated conflicts against ancient versions of ia32-libs
  - Drop the tzdata dependency from libc6, it's in required and minimal
  - Use gcc-4.7/g++-4.7 by default on all our supported architectures
  - Save our historical changelog as changelog.ubuntu in the source
  - Drop nscd's libaudit build-dep for now, as libaudit is in universe
  - Drop the unnecessary Breaks from libc6 to locales and locales-all
  - Ship xen's ld.so.conf.d snippet as /etc/ld.so.conf.d/libc6-xen.conf
* Disable hard failures on the test suite for the first upload to raring

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
2011-07-13  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
2
 
 
3
 
        * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
4
 
        (INTERNAL_VSYSCALL_NCS): Use r10 for backing up the return address
5
 
        register in order to avoid conflicts with the soft frame pointer
6
 
        being held in r11 when necessary.
7
 
        * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
8
 
        (INTERNAL_VSYSCALL_NCS): Likewise.
9
 
 
10
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
11
 
index 5bfdc44..13ce9ab 100644
12
 
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
13
 
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
14
 
@@ -368,12 +368,12 @@
15
 
     DECLARGS_##nr(args)                                                              \
16
 
     register long _ret asm("2");                                                     \
17
 
     asm volatile (                                                           \
18
 
-    "lr 11,14\n\t"                                                           \
19
 
+    "lr 10,14\n\t"                                                           \
20
 
     "basr 14,%1\n\t"                                                         \
21
 
-    "lr 14,11\n\t"                                                           \
22
 
+    "lr 14,10\n\t"                                                           \
23
 
     : "=d" (_ret)                                                            \
24
 
     : "d" (fn) ASMFMT_##nr                                                   \
25
 
-    : "cc", "memory", "0", "1", "11" CLOBBER_##nr);                          \
26
 
+    : "cc", "memory", "0", "1", "10" CLOBBER_##nr);                          \
27
 
     _ret; })
28
 
 
29
 
 /* Pointer mangling support.  */
30
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
31
 
index 6491a3b..4d45417 100644
32
 
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
33
 
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
34
 
@@ -370,12 +370,12 @@
35
 
     DECLARGS_##nr(args)                                                              \
36
 
     register long _ret asm("2");                                             \
37
 
     asm volatile (                                                           \
38
 
-    "lgr 11,14\n\t"                                                          \
39
 
+    "lgr 10,14\n\t"                                                          \
40
 
     "basr 14,%1\n\t"                                                         \
41
 
-    "lgr 14,11\n\t"                                                          \
42
 
+    "lgr 14,10\n\t"                                                          \
43
 
     : "=d" (_ret)                                                            \
44
 
     : "a" (fn) ASMFMT_##nr                                                   \
45
 
-    : "cc", "memory", "0", "1", "11" CLOBBER_##nr);                          \
46
 
+    : "cc", "memory", "0", "1", "10" CLOBBER_##nr);                          \
47
 
     _ret; })
48
 
 
49
 
 /* Pointer mangling support.  */