Index: mpi/alpha/mpih-add1.S =================================================================== --- mpi/alpha/mpih-add1.S +++ mpi/alpha/mpih-add1.S @@ -1,6 +1,6 @@ /* alpha add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. - * Copyright (C) 1995, 1998, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998, 2001, 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -19,8 +19,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include "sysdep.h" +#include "asm-syntax.h" + /******************* * mpi_limb_t * _gcry_mpih_add_n( mpi_ptr_t res_ptr, ($16) @@ -34,9 +37,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_add_n - .ent _gcry_mpih_add_n -_gcry_mpih_add_n: + .globl C_SYMBOL_NAME(gcry_mpih_add_n) + .ent C_SYMBOL_NAME(gcry_mpih_add_n) +C_SYMBOL_NAME(gcry_mpih_add_n): .frame $30,0,$26,0 ldq $3,0($17) @@ -120,5 +123,5 @@ or $0,$1,$0 ret $31,($26),1 - .end _gcry_mpih_add_n + .end C_SYMBOL_NAME(gcry_mpih_add_n) Index: mpi/alpha/mpih-lshift.S =================================================================== --- mpi/alpha/mpih-lshift.S +++ mpi/alpha/mpih-lshift.S @@ -1,7 +1,7 @@ /* alpha - left shift * * Copyright (C) 1994, 1995, 1998, 2001, - * 2002 Free Software Foundation, Inc. + * 2002, 2008 Free Software Foundation, Inc. * * * This file is part of Libgcrypt. @@ -27,6 +27,8 @@ * to avoid revealing of sensitive data due to paging etc. */ +#include "sysdep.h" +#include "asm-syntax.h" /******************* @@ -51,9 +53,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_lshift - .ent _gcry_mpih_lshift -_gcry_mpih_lshift: + .globl C_SYMBOL_NAME(gcry_mpih_lshift) + .ent C_SYMBOL_NAME(gcry_mpih_lshift) +C_SYMBOL_NAME(gcry_mpih_lshift): .frame $30,0,$26,0 s8addq $18,$17,$17 # make r17 point at end of s1 @@ -117,6 +119,6 @@ .Lend: sll $4,$19,$8 stq $8,-8($16) ret $31,($26),1 - .end _gcry_mpih_lshift + .end C_SYMBOL_NAME(gcry_mpih_lshift) Index: mpi/alpha/mpih-mul1.S =================================================================== --- mpi/alpha/mpih-mul1.S +++ mpi/alpha/mpih-mul1.S @@ -2,7 +2,7 @@ * the result in a second limb vector. * * Copyright (C) 1992, 1994, 1995, 1998, - * 2001, 2002 Free Software Foundation, Inc. + * 2001, 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -21,7 +21,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include "sysdep.h" +#include "asm-syntax.h" + + /******************* * mpi_limb_t * _gcry_mpih_mul_1( mpi_ptr_t res_ptr, (r16) @@ -45,9 +49,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_mul_1 - .ent _gcry_mpih_mul_1 2 -_gcry_mpih_mul_1: + .globl C_SYMBOL_NAME(gcry_mpih_mul_1) + .ent C_SYMBOL_NAME(gcry_mpih_mul_1) 2 +C_SYMBOL_NAME(gcry_mpih_mul_1): .frame $30,0,$26 ldq $2,0($17) # $2 = s1_limb @@ -85,6 +89,8 @@ Lend1: stq $3,0($16) ret $31,($26),1 - .end _gcry_mpih_mul_1 + .end C_SYMBOL_NAME(gcry_mpih_mul_1) + + Index: mpi/alpha/mpih-mul2.S =================================================================== --- mpi/alpha/mpih-mul2.S +++ mpi/alpha/mpih-mul2.S @@ -2,7 +2,7 @@ * the result to a second limb vector. * * Copyright (C) 1992, 1994, 1995, 1998, - * 2001, 2002 Free Software Foundation, Inc. + * 2001, 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -21,6 +21,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include "sysdep.h" +#include "asm-syntax.h" + /******************* * mpi_limb_t @@ -37,9 +40,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_addmul_1 - .ent _gcry_mpih_addmul_1 2 -_gcry_mpih_addmul_1: + .globl C_SYMBOL_NAME(gcry_mpih_addmul_1) + .ent C_SYMBOL_NAME(gcry_mpih_addmul_1) 2 +C_SYMBOL_NAME(gcry_mpih_addmul_1): .frame $30,0,$26 ldq $2,0($17) # $2 = s1_limb @@ -93,5 +96,5 @@ addq $0,$5,$0 ret $31,($26),1 - .end _gcry_mpih_addmul_1 + .end C_SYMBOL_NAME(gcry_mpih_addmul_1) Index: mpi/alpha/mpih-mul3.S =================================================================== --- mpi/alpha/mpih-mul3.S +++ mpi/alpha/mpih-mul3.S @@ -1,7 +1,7 @@ /* Alpha 21064 submul_1 -- Multiply a limb vector with a limb and * subtract the result from a second limb vector. * Copyright (C) 1992, 1994, 1995, 1998, - * 2001, 2002 Free Software Foundation, Inc. + * 2001, 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -20,7 +20,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include "sysdep.h" +#include "asm-syntax.h" + /******************* * mpi_limb_t * _gcry_mpih_submul_1( mpi_ptr_t res_ptr, (r16 ) @@ -35,9 +38,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_submul_1 - .ent _gcry_mpih_submul_1 2 -_gcry_mpih_submul_1: + .globl C_SYMBOL_NAME(gcry_mpih_submul_1) + .ent C_SYMBOL_NAME(gcry_mpih_submul_1) 2 +C_SYMBOL_NAME(gcry_mpih_submul_1): .frame $30,0,$26 ldq $2,0($17) # $2 = s1_limb @@ -91,5 +94,5 @@ addq $0,$5,$0 ret $31,($26),1 - .end _gcry_mpih_submul_1 + .end C_SYMBOL_NAME(gcry_mpih_submul_1) Index: mpi/alpha/mpih-rshift.S =================================================================== --- mpi/alpha/mpih-rshift.S +++ mpi/alpha/mpih-rshift.S @@ -1,6 +1,6 @@ /* alpha rshift - * Copyright (C) 1994, 1995, 1998, 1999, - * 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1994, 1995, 1998, 1999, 2000, 2001, + * 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -25,9 +25,10 @@ * to avoid revealing of sensitive data due to paging etc. */ +#include "sysdep.h" +#include "asm-syntax.h" - - + /******************* * mpi_limb_t * _gcry_mpih_rshift( mpi_ptr_t wp, (r16) @@ -50,9 +51,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_rshift - .ent _gcry_mpih_rshift -_gcry_mpih_rshift: + .globl C_SYMBOL_NAME(gcry_mpih_rshift) + .ent C_SYMBOL_NAME(gcry_mpih_rshift) +C_SYMBOL_NAME(gcry_mpih_rshift): .frame $30,0,$26,0 ldq $4,0($17) # load first limb @@ -114,5 +115,7 @@ .Rend: srl $4,$19,$8 stq $8,0($16) ret $31,($26),1 - .end _gcry_mpih_rshift + .end C_SYMBOL_NAME(gcry_mpih_rshift) + + Index: mpi/alpha/mpih-sub1.S =================================================================== --- mpi/alpha/mpih-sub1.S +++ mpi/alpha/mpih-sub1.S @@ -1,7 +1,7 @@ /* Alpha sub_n -- Subtract two limb vectors of the same length > 0 and * store difference in a third limb vector. * Copyright (C) 1995, 1998, - * 2001, 2002 Free Software Foundation, Inc. + * 2001, 2002, 2008 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * @@ -20,7 +20,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include "sysdep.h" +#include "asm-syntax.h" + /******************* * mpi_limb_t * _gcry_mpih_sub_n( mpi_ptr_t res_ptr, (r16) @@ -33,9 +36,9 @@ .set noat .text .align 3 - .globl _gcry_mpih_sub_n - .ent _gcry_mpih_sub_n -_gcry_mpih_sub_n: + .globl C_SYMBOL_NAME(gcry_mpih_sub_n) + .ent C_SYMBOL_NAME(gcry_mpih_sub_n) +C_SYMBOL_NAME(gcry_mpih_sub_n): .frame $30,0,$26,0 ldq $3,0($17) @@ -119,6 +122,6 @@ or $0,$1,$0 ret $31,($26),1 - .end _gcry_mpih_sub_n + .end C_SYMBOL_NAME(gcry_mpih_sub_n) Index: mpi/alpha/udiv-qrnnd.S =================================================================== --- mpi/alpha/udiv-qrnnd.S +++ mpi/alpha/udiv-qrnnd.S @@ -27,7 +27,6 @@ */ - .set noreorder .set noat .text