Commit b707c7b6 authored by Andreas Gal's avatar Andreas Gal
Browse files

Merge.

parents 3f9f079d 1d91ed9e

js/src/config/Linux_All.mk

+4 −4
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ endif # gcc 
endif # 86

endif # !x86_64



#ifeq ($(CPU_ARCH),x86_64)

#OS_CFLAGS += -DAVMPLUS_AMD64 -DAVMPLUS_64BIT -DAVMPLUS_LINUX

#NANOJIT_ARCH = i386

#endif

ifeq ($(CPU_ARCH),x86_64)

OS_CFLAGS += -DAVMPLUS_AMD64 -DAVMPLUS_64BIT -DAVMPLUS_LINUX

NANOJIT_ARCH = i386

endif



ifeq ($(CPU_ARCH),arm)

OS_CFLAGS += -DAVMPLUS_ARM -DAVMPLUS_LINUX

js/src/nanojit/NativeAMD64.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ namespace nanojit 
	static const RegisterMask FpRegs = XmmRegs;

	static const RegisterMask ScratchRegs = TempRegs | XmmRegs;



	static const RegisterMask AllowableFlagRegs = GpRegs;

	static const RegisterMask AllowableFlagRegs = 1<<RAX |1<<RCX | 1<<RDX | 1<<RBX;



    #if defined WIN64

    typedef __int64 nj_printf_ld;