Commit f0e63a2c authored by Ted Mielczarek's avatar Ted Mielczarek
Browse files

Update NSPR to NSPR_4_9_BETA4 tag. Fixes bug 681558, bug 675593, bug 674277, bug 481815 

--HG--
extra : rebase_source : 83d02f6ace9a1eebb7b00e2f5ca0ec0cc2f76776
parent 69c7308a

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_9_BETA3
 
NSPR_4_9_BETA4

nsprpub/config/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -75,17 +75,25 @@ NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ 
LDFLAGS		= $(OS_LDFLAGS)



# Enable profile-guided optimization

ifndef NO_PROFILE_GUIDED_OPTIMIZE

ifdef MOZ_PROFILE_GENERATE

CFLAGS += $(PROFILE_GEN_CFLAGS)

LDFLAGS += $(PROFILE_GEN_LDFLAGS)

DLLFLAGS += $(PROFILE_GEN_LDFLAGS)

ifeq (WINNT,$(OS_ARCH))

AR_FLAGS += -LTCG

endif

endif # MOZ_PROFILE_GENERATE



ifdef MOZ_PROFILE_USE

CFLAGS += $(PROFILE_USE_CFLAGS)

LDFLAGS += $(PROFILE_USE_LDFLAGS)

DLLFLAGS += $(PROFILE_USE_LDFLAGS)

ifeq (WINNT,$(OS_ARCH))

AR_FLAGS += -LTCG

endif

endif # MOZ_PROFILE_USE

endif # NO_PROFILE_GUIDED_OPTIMIZE



define MAKE_OBJDIR

if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi

nsprpub/config/prdepend.h

+0 −1
Original line number Diff line number Diff line
@@ -43,4 +43,3 @@ 


#error "Do not include this header file."

nsprpub/configure

+114 −111

File changed.

Preview size limit exceeded, changes collapsed.

nsprpub/configure.in

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ arm-linux*-android*|*-linuxandroid*) 
arm-android-eabi)

    android_tool_prefix="arm-eabi"

    ;;

i?86-*android*)

    android_tool_prefix="i686-android-linux"

    ;;

*)

    android_tool_prefix="$target_os"

    ;;