Attachment #315847 for bug #421817

View | Details | Raw Unified | Return to bug 421817
Collapse All | Expand All




ifeq ($(OS_TEST),x86_64)
ifeq ($(USE_64),1)
	CPU_ARCH	= x86_64
	ARCHFLAG	= -m64
else
ifeq ($(USE_x32),1)
	OS_REL_CFLAGS	= -Di386
	CPU_ARCH	= x86
	ARCHFLAG	= -mx32
else
	OS_REL_CFLAGS	= -Di386
	CPU_ARCH	= x86
	ARCHFLAG	= -m32
endif
endif
else
ifeq ($(OS_TEST),sparc64)
	CPU_ARCH        = sparc




    MPI_SRCS += mpi_amd64.c mp_comba.c
endif
ifeq ($(CPU_ARCH),x86)
    ifeq ($(USE_x32),1)
        DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
    else
        ASFILES  = mpi_x86.s
        DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
        DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
        DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
        # The floating point ECC code doesn't work on Linux x86 (bug 311432).
        #ECL_USE_FP = 1
    endif
endif
ifeq ($(CPU_ARCH),arm)
    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 

Return to bug 421817

Lines 65-75 Link Here

(-)nss-3.13.5.orig/mozilla/security/coreconf/Linux.mk (+7 lines)
65	ifeq ($(OS_TEST),x86_64)	65	ifeq ($(OS_TEST),x86_64)
66	ifeq ($(USE_64),1)	66	ifeq ($(USE_64),1)
67	CPU_ARCH = x86_64	67	CPU_ARCH = x86_64
		68	ARCHFLAG = -m64
		69	else
		70	ifeq ($(USE_x32),1)
		71	OS_REL_CFLAGS = -Di386
		72	CPU_ARCH = x86
		73	ARCHFLAG = -mx32
68	else	74	else
69	OS_REL_CFLAGS = -Di386	75	OS_REL_CFLAGS = -Di386
70	CPU_ARCH = x86	76	CPU_ARCH = x86
71	ARCHFLAG = -m32	77	ARCHFLAG = -m32
72	endif	78	endif
		79	endif
73	else	80	else
74	ifeq ($(OS_TEST),sparc64)	81	ifeq ($(OS_TEST),sparc64)
75	CPU_ARCH = sparc	82	CPU_ARCH = sparc

Lines 215-226 Link Here

(-)nss-3.13.5.orig/mozilla/security/nss/lib/freebl/Makefile (-6 / +10 lines)
215	MPI_SRCS += mpi_amd64.c mp_comba.c	215	MPI_SRCS += mpi_amd64.c mp_comba.c
216	endif	216	endif
217	ifeq ($(CPU_ARCH),x86)	217	ifeq ($(CPU_ARCH),x86)
218	ASFILES = mpi_x86.s	218	ifeq ($(USE_x32),1)
219	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE	219	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
220	DEFINES += -DMP_ASSEMBLY_DIV_2DX1D	220	else
221	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN	221	ASFILES = mpi_x86.s
222	# The floating point ECC code doesn't work on Linux x86 (bug 311432).	222	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
223	#ECL_USE_FP = 1	223	DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
		224	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
		225	# The floating point ECC code doesn't work on Linux x86 (bug 311432).
		226	#ECL_USE_FP = 1
		227	endif
224	endif	228	endif
225	ifeq ($(CPU_ARCH),arm)	229	ifeq ($(CPU_ARCH),arm)
226	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE	230	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE