moz/patches/arm_build_fix.patch

   1 --- misc/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp    2010-01-29 08:39:01.000000000 +0000
   2 +++ misc/build/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp      2010-01-29 08:41:01.000000000 +0000
   3 @@ -44,8 +44,21 @@
   4  #error "This code is for Linux ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour."
   5  #endif
   6
   7 +#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
   8 +/* This tells gcc3.4+ not to optimize away symbols.
   9 + *  * @see http://gcc.gnu.org/gcc-3.4/changes.html
  10 + *   */
  11 +#define DONT_DROP_OR_WARN __attribute__((used))
  12 +#else
  13 +/* This tells older gccs not to warn about unused vairables.
  14 + *  * @see http://docs.freebsd.org/info/gcc/gcc.info.Variable_Attributes.html
  15 + *   */
  16 +#define DONT_DROP_OR_WARN __attribute__((unused))
  17 +#endif
  18 +
  19  /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
  20 -static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
  21 +static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch")
  22 +DONT_DROP_OR_WARN;
  23
  24  static nsresult
  25  PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
  26 --- misc/mozilla/security/nss/cmd/shlibsign/Makefile    2010-02-05 13:13:56.000000000 +0000
  27 +++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile      2010-02-05 13:14:16.000000000 +0000
  28 @@ -124,5 +124,5 @@
  29  endif
  30  endif
  31
  32 -libs install :: $(CHECKLOC)
  33 +libs install ::
  34
  35 --- misc/mozilla/security/manager/Makefile.in   2010-02-05 13:27:25.000000000 +0000
  36 +++ misc/build/mozilla/security/manager/Makefile.in     2010-02-05 13:28:00.000000000 +0000
  37 @@ -53,7 +53,6 @@
  38         SMIME3_LIB \
  39         SSL3_LIB \
  40         SOFTOKEN3_LIB \
  41 -       SOFTOKEN3_CHK \
  42         LOADABLE_ROOT_MODULE \
  43         HAVE_FREEBL_LIBS \
  44         HAVE_FREEBL_LIBS_32 \
  45 @@ -68,7 +67,6 @@
  46  SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
  47  SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
  48  SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
  49 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
  50
  51  # Default
  52  HAVE_FREEBL_LIBS = 1
  53 @@ -99,23 +97,17 @@
  54
  55  ifdef HAVE_FREEBL_LIBS
  56  FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX)
  57 -FREEBL_CHK = $(DLL_PREFIX)freebl3.chk
  58  endif
  59  ifdef HAVE_FREEBL_LIBS_32
  60  FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX)
  61 -FREEBL_32INT_CHK = libfreebl_32int_3.chk
  62  FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX)
  63 -FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk
  64  endif
  65  ifdef HAVE_FREEBL_LIBS_32INT64
  66  FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX)
  67 -FREEBL_32INT64_CHK = libfreebl_32int64_3.chk
  68  endif
  69  ifdef HAVE_FREEBL_LIBS_64
  70  FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX)
  71 -FREEBL_64INT_CHK = libfreebl_64int_3.chk
  72  FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
  73 -FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
  74  endif
  75
  76  ABS_DIST := $(shell cd $(DIST) && pwd)
  77 @@ -210,7 +202,6 @@
  78         OS_ARCH="$(OS_ARCH)" \
  79         CPU_ARCH="$(TARGET_CPU)" \
  80         $(NULL)
  81 -SKIP_CHK=1
  82  endif
  83  SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
  84
  85 @@ -223,10 +214,6 @@
  86  ifndef MOZ_NATIVE_NSS
  87         $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
  88         $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
  89 -ifndef SKIP_CHK
  90 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
  91 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
  92 -endif
  93         touch $@
  94  endif
  95
  96 @@ -262,43 +249,22 @@
  97         # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
  98         $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
  99         $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
 100 -ifndef SKIP_CHK
 101 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 102 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 103 -endif
 104         $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 105 -ifndef SKIP_CHK
 106 -       $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
 107 -endif
 108         $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
 109         $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
 110         $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 111         $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
 112  ifdef HAVE_FREEBL_LIBS
 113 -ifndef SKIP_CHK
 114 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
 115 -endif
 116         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
 117  endif
 118  ifdef HAVE_FREEBL_LIBS_32
 119 -ifndef SKIP_CHK
 120 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
 121 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
 122 -endif
 123         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
 124         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
 125  endif
 126  ifdef HAVE_FREEBL_LIBS_32INT64
 127 -ifndef SKIP_CHK
 128 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
 129 -endif
 130         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
 131  endif
 132  ifdef HAVE_FREEBL_LIBS_64
 133 -ifndef SKIP_CHK
 134 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
 135 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
 136 -endif
 137         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
 138         $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 139  endif
 140 @@ -313,38 +279,21 @@
 141  install::
 142  ifndef MOZ_NATIVE_NSS
 143         $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 144 -ifndef SKIP_CHK
 145 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
 146 -endif
 147         $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
 148         $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
 149         $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 150         $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 151  ifdef HAVE_FREEBL_LIBS
 152 -ifndef SKIP_CHK
 153 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
 154 -endif
 155         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
 156  endif
 157  ifdef HAVE_FREEBL_LIBS_32
 158 -ifndef SKIP_CHK
 159 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
 160 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
 161 -endif
 162         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
 163         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
 164  endif
 165  ifdef HAVE_FREEBL_LIBS_32INT64
 166 -ifndef SKIP_CHK
 167 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
 168 -endif
 169         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
 170  endif
 171  ifdef HAVE_FREEBL_LIBS_64
 172 -ifndef SKIP_CHK
 173 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
 174 -       $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
 175 -endif
 176         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
 177         $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
 178  endif
 179 @@ -366,10 +315,6 @@
 180  ifndef MOZ_NATIVE_NSS
 181         $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 182         $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 183 -ifndef SKIP_CHK
 184 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 185 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 186 -endif
 187  endif
 188
 189  echo-requires-recursive::