Commit ace147b8 authored by Kyle Huey's avatar Kyle Huey
Browse files

Update to NSPR 4.8.7 RTM to erase changes that landed in Bug 618789. a=me

parent 755fc3bf

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.in

+2 −36
Original line number Diff line number Diff line
@@ -912,37 +912,18 @@ AC_ARG_ENABLE(os2-high-mem, 
        MOZ_OS2_HIGH_MEMORY=1

      fi ])



dnl Setup default CPU arch for arm target

case "$target_cpu" in

  arm*)

    MOZ_ARM_ARCH=armv7

  ;;

esac

dnl ========================================================

dnl = Enable building the Thumb2 instruction set

dnl ========================================================

AC_ARG_ENABLE(thumb2,

 [  --enable-thumb2              Enable Thumb2 instruction set (implies ARMv7)],

 [  --enable-thumb2              Enable Thumb2 instruction set],

 [ if test "$enableval" = "yes"; then

     MOZ_THUMB2=1,

   fi ])

if test -n "$MOZ_THUMB2"; then

  MOZ_ARM_ARCH=armv7

fi



dnl ========================================================

dnl = Enable building for ARM specific CPU features

dnl ========================================================

MOZ_ARG_WITH_STRING(cpu-arch,

[  --with-cpu-arch=arch      Use specific arm architecture CPU features, default armv7],

    MOZ_ARM_ARCH=$withval)



if test -n "$MOZ_THUMB2"; then

  case "$target_cpu" in

    arm*)

      if test "$MOZ_ARM_ARCH" != "armv7"; then

        AC_MSG_ERROR([--enable-thumb2 is not compatible with cpu-arch=$MOZ_ARM_ARCH])

      fi

      if test "$GNU_CC"; then

        CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"

        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb"
@@ -955,21 +936,6 @@ if test -n "$MOZ_THUMB2"; then 
      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])

    ;;

  esac

elif test "$MOZ_ARM_ARCH" = "armv7"; then

  case "$target_cpu" in

    arm*)

      if test "$GNU_CC"; then

        CFLAGS="$CFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"

        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -Wa, -march=armv7-a -Wa, -marm"

        ASFLAGS="$ASFLAGS -march=armv7-a -marm"

      else

        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])

      fi

    ;;

    *)

      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])

    ;;

  esac

else

  case "$target_cpu" in

    arm*)