diff options
| author | Werner Koch <[email protected]> | 2011-07-04 10:41:45 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-07-04 10:41:45 +0000 |
| commit | 6daa9dbd7cd689758c060cf516d006041dabcdd5 (patch) | |
| tree | a553674e2841ee5ec7e2345a404d9f4aceece3b0 | |
| parent | Add pubkey letters e and E for ECC. (diff) | |
| download | gnupg-6daa9dbd7cd689758c060cf516d006041dabcdd5.tar.gz gnupg-6daa9dbd7cd689758c060cf516d006041dabcdd5.zip | |
Allow building for ARM thumb. Fixes bug#1202.
| -rw-r--r-- | mpi/ChangeLog | 13 | ||||
| -rw-r--r-- | mpi/longlong.h | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog index a99acae80..1f81333ba 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2011-07-04 Werner Koch <[email protected]> + + * longlong.h: [__arm__]: Do no use asm if thumb code generation is + enabled. Fixes bug#1202. + 2010-10-28 Werner Koch <[email protected]> * longlong.h: Revert last two changes and replace by code from @@ -206,7 +211,7 @@ 2002-08-02 Timo Schulz <[email protected]> * mpicoder.c: Add a '\n' to all log_bug functions. - + 2002-08-01 Werner Koch <[email protected]> * config.links: Added case for sparc64-netbsd. Suggested by @@ -239,7 +244,7 @@ * i386/mpih-add1.S, i386/mpih-sub1.S, i386/mpih-rshift.S, i386/mpih-lshift.S: Minor syntax changes suggested by Mark Pettit after comparing the files with those for GMP 4. - + 2001-11-08 Werner Koch <[email protected]> * config.links (mpi_sflags): Add extra rule for sparc64-sun-solaris2. @@ -290,7 +295,7 @@ * mpi.h: Removed the inclusion of mpi-asm-defs.h because this makes some trouble when doing a VPATH build. configure now takes care of it. - + 2000-10-12 Werner Koch <[email protected]> * generic/mpi-asm-defs.h: New. @@ -551,5 +556,3 @@ Mon Feb 16 13:00:27 1998 Werner Koch ([email protected]) This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - diff --git a/mpi/longlong.h b/mpi/longlong.h index f17e84a88..a4c18a4a4 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -2,7 +2,7 @@ Note: I added some stuff for use with gnupg Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998, - 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003, 2011 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -180,7 +180,7 @@ extern UDItype __udiv_qrnnd (); /*************************************** ************** ARM ****************** ***************************************/ -#if defined (__arm__) && W_TYPE_SIZE == 32 +#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined (__thumb__) #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("adds %1, %4, %5\n" \ "adc %0, %2, %3" \ |