This week only. Pastebin PRO Accounts Christmas Special! Don't miss out!Want more features on Pastebin? Sign Up, it's FREE!
Guest

NSS bugfix (don't check whether USE_64 is defined but whether it is 0 or not)

By: a guest on Sep 20th, 2010  |  syntax: Diff  |  size: 1.87 KB  |  views: 70  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. don't check whether USE_64 is defined but whether it is 0 or not
  2.  
  3. --- mozilla/security/nss/lib/freebl/Makefile    2010-01-29 00:10:07.000000000 +0
  4. 100
  5. +++ Makefile    2010-08-25 13:29:14.000000000 +0200
  6. @@ -66,7 +66,7 @@
  7.  # unset this on those that have multiple freebl libraries
  8.  FREEBL_BUILD_SINGLE_SHLIB = 1
  9.  
  10. -ifdef USE_64
  11. +ifneq ($(USE_64),0)
  12.         DEFINES += -DNSS_USE_64
  13.  endif
  14.  
  15. @@ -82,7 +82,7 @@
  16.  # NSS_X86_OR_X64 means the target is either x86 or x64
  17.  ifeq (,$(filter-out x386 x86 x86_64,$(CPU_ARCH)))
  18.          DEFINES += -DNSS_X86_OR_X64
  19. -ifdef USE_64
  20. +ifneq ($(USE_64),0)
  21.          DEFINES += -DNSS_X64
  22.  else
  23.          DEFINES += -DNSS_X86
  24. @@ -103,7 +103,7 @@
  25.  endif
  26.  
  27.  ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))  #omits WINCE
  28. -ifndef USE_64
  29. +ifeq ($(USE_64),0)
  30.  # 32-bit Windows
  31.  ifdef NS_USE_GCC
  32.  # Ideally, we want to use assembler
  33. @@ -179,7 +179,7 @@
  34.  
  35.  ifeq ($(OS_TARGET),AIX)
  36.      DEFINES += -DMP_USE_UINT_DIGIT
  37. -    ifndef USE_64
  38. +    ifeq ($(USE_64),0)
  39.         DEFINES += -DMP_NO_DIV_WORD -DMP_NO_ADD_WORD -DMP_NO_SUB_WORD
  40.      endif
  41.  endif # AIX
  42. @@ -188,7 +188,7 @@
  43.  ifneq ($(OS_TEST), ia64)
  44.  # PA-RISC
  45.  ASFILES += ret_cr16.s
  46. -ifndef USE_64
  47. +ifeq ($(USE_64),0)
  48.      FREEBL_BUILD_SINGLE_SHLIB =
  49.      HAVE_ABI32_INT32 = 1
  50.      HAVE_ABI32_FPU = 1
  51. @@ -199,7 +199,7 @@
  52.      DEFINES  += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
  53.      DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
  54.  else
  55. -ifdef USE_64
  56. +ifneq ($(USE_64),0)
  57.  # this builds for DA2.0W (HP PA 2.0 Wide), the LP64 ABI, using 64-bit digits
  58.      MPI_SRCS += mpi_hp.c
  59.      ASFILES  += hpma512.s hppa20.s
  60. @@ -247,7 +247,7 @@
  61.  # We always use Sun's assembler, which uses Sun's naming convention.
  62.  ifeq ($(CPU_ARCH),sparc)
  63.      FREEBL_BUILD_SINGLE_SHLIB=
  64. -    ifdef USE_64
  65. +    ifneq ($(USE_64),0)
  66.          HAVE_ABI64_INT = 1
  67.          HAVE_ABI64_FPU = 1
  68.      else
clone this paste RAW Paste Data