[Pkg-gnutls-commits] r1134 - in /packages/libgcrypt11/trunk/debian: changelog patches/20_workaroundarmgcc.diff patches/series rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Wed Jul 27 17:28:11 2011
New Revision: 1134

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1134
Log:
[20_workaroundarmgcc.diff] Set __attribute__((noinline)) on
do_decrypt_aligned() if DEB_BUILD_ARCH=arm. This works around gcc bug
633458.

Added:
    packages/libgcrypt11/trunk/debian/patches/20_workaroundarmgcc.diff
Modified:
    packages/libgcrypt11/trunk/debian/changelog
    packages/libgcrypt11/trunk/debian/patches/series
    packages/libgcrypt11/trunk/debian/rules

Modified: packages/libgcrypt11/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/changelog?rev=1134&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/changelog (original)
+++ packages/libgcrypt11/trunk/debian/changelog Wed Jul 27 17:28:11 2011
@@ -1,8 +1,10 @@
-libgcrypt11 (1.4.6-8) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 25 Jun 2011 19:42:18 +0200
+libgcrypt11 (1.4.6-8) unstable; urgency=medium
+
+  * [20_workaroundarmgcc.diff] Set __attribute__((noinline)) on
+    do_decrypt_aligned() if DEB_BUILD_ARCH=arm. This works around gcc bug
+    633458.
+
+ -- Andreas Metzler <ametzler at debian.org>  Wed, 27 Jul 2011 19:09:35 +0200
 
 libgcrypt11 (1.4.6-7) unstable; urgency=low
 

Added: packages/libgcrypt11/trunk/debian/patches/20_workaroundarmgcc.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/patches/20_workaroundarmgcc.diff?rev=1134&op=file
==============================================================================
--- packages/libgcrypt11/trunk/debian/patches/20_workaroundarmgcc.diff (added)
+++ packages/libgcrypt11/trunk/debian/patches/20_workaroundarmgcc.diff Wed Jul 27 17:28:11 2011
@@ -1,0 +1,17 @@
+Description: Disable inlining on do_decrypt_aligned() on ARM. This works
+ around gcc issue #633458, which had broken gnutls on ARM.
+Author: Andreas Metzler <ametzler at debian.org>
+Bug-Debian: http://bugs.debian.org/633458
+
+--- libgcrypt11-1.4.6.orig/cipher/rijndael.c
++++ libgcrypt11-1.4.6/cipher/rijndael.c
+@@ -569,6 +569,9 @@ _gcry_aes_cbc_enc (void *context, unsign
+ /* Decrypt one block.  A and B need to be aligned on a 4 byte boundary
+    and the decryption must have been prepared.  A and B may be the
+    same. */
++#ifdef ARMWORKAROUND633458
++__attribute__((noinline))
++#endif
+ static void
+ do_decrypt_aligned (RIJNDAEL_context *ctx, 
+                     unsigned char *b, const unsigned char *a)

Modified: packages/libgcrypt11/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/patches/series?rev=1134&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/patches/series (original)
+++ packages/libgcrypt11/trunk/debian/patches/series Wed Jul 27 17:28:11 2011
@@ -1,2 +1,3 @@
 12_lessdeps_libgcrypt-config.diff
 13_ftbfs_gold.diff
+20_workaroundarmgcc.diff

Modified: packages/libgcrypt11/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/rules?rev=1134&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/rules (original)
+++ packages/libgcrypt11/trunk/debian/rules Wed Jul 27 17:28:11 2011
@@ -9,6 +9,11 @@
 	--enable-ld-version-script --libdir=/lib/$(DEB_HOST_MULTIARCH)
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 DEB_MAKE_CHECK_TARGET = check
+endif
+
+ifeq ($(DEB_BUILD_ARCH),armel)
+CPPFLAGS += -DARMWORKAROUND633458
+export CPPFLAGS
 endif
 
 DEB_DH_STRIP_ARGS = --dbg-package=libgcrypt11-dbg