Bug 1160514: Use osslsigncode for 32-bit signing r=ted

toolkit/mozapps/installer/signing.mk

@@ -8,13 +8,8 @@ ifndef MOZ_PROFILE_GENERATE
 # Signing support
 ifdef MOZ_SIGN_CMD
 ifeq (WINNT,$(OS_ARCH))
-ifeq (x86_64,$(TARGET_CPU))
 MOZ_INTERNAL_SIGNING_FORMAT := osslsigncode
 MOZ_EXTERNAL_SIGNING_FORMAT := osslsigncode
-else
-MOZ_INTERNAL_SIGNING_FORMAT := signcode
-MOZ_EXTERNAL_SIGNING_FORMAT := signcode
-endif
 SIGN_INCLUDES := \
   '*.dll' \
   '*.exe' \

toolkit/mozapps/installer/upload-files.mk

@@ -151,8 +151,8 @@ MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
 endif
 ifeq ($(MOZ_PKG_FORMAT),ZIP)
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
-# We can't use signcode on zip files
-MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
+# We can't use osslsigncode on zip files
+MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
 endif
 PKG_SUFFIX	= .zip
 INNER_MAKE_PACKAGE	= $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \

tools/update-packaging/Makefile.in

@@ -46,8 +46,8 @@ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
-# We can't use signcode on mar files
-MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
+# We can't use osslsigncode on mar files
+MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
 MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT)
 endif