diff --git a/mozilla/security/coreconf/IRIX.mk b/mozilla/security/coreconf/IRIX.mk
index cc976e04cbd..f74da36b35a 100644
--- a/mozilla/security/coreconf/IRIX.mk
+++ b/mozilla/security/coreconf/IRIX.mk
@@ -58,7 +58,7 @@ ifdef NS_USE_GCC
 else
 	CC	= cc
 	CCC		= CC
-	ODD_CFLAGS	= -fullwarn -xansi
+	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
 	ifdef BUILD_OPT
 		ifeq ($(USE_N32),1)
 			OPTIMIZER	= -O -OPT:Olimit=4000
@@ -91,10 +91,9 @@ RANLIB		= /bin/true
 # NOTE: should always define _SGI_MP_SOURCE
 NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
 
-ifndef NO_MDUPDATE
-	OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
-else
-	OS_CFLAGS += $(NOMD_OS_CFLAGS)
+OS_CFLAGS += $(NOMD_OS_CFLAGS)
+ifdef USE_MDUPDATE
+	OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 endif
 
 ifeq ($(USE_N32),1)
diff --git a/mozilla/security/coreconf/SunOS5.4_i86pc.mk b/mozilla/security/coreconf/SunOS5.4_i86pc.mk
index bed9893edf3..35dfdb86ad3 100644
--- a/mozilla/security/coreconf/SunOS5.4_i86pc.mk
+++ b/mozilla/security/coreconf/SunOS5.4_i86pc.mk
@@ -43,10 +43,9 @@ ifdef NS_USE_GCC
 	CCC		= g++
 	CCC		+= -Wall -Wno-format
 	ASFLAGS		+= -x assembler-with-cpp
-	ifdef NO_MDUPDATE
-		OS_CFLAGS += $(NOMD_OS_CFLAGS)
-	else
-		OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
+	OS_CFLAGS	+= $(NOMD_OS_CFLAGS)
+	ifdef USE_MDUPDATE
+		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 else
 	CC		= cc
diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk
index 37b65293fad..37c98c7879c 100644
--- a/mozilla/security/coreconf/SunOS5.mk
+++ b/mozilla/security/coreconf/SunOS5.mk
@@ -100,10 +100,9 @@ ifdef NS_USE_GCC
 	CCC        = g++
 	CCC       += -Wall -Wno-format
 	ASFLAGS	  += -x assembler-with-cpp
-	ifdef NO_MDUPDATE
-		OS_CFLAGS += $(NOMD_OS_CFLAGS)
-	else
-		OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
+	OS_CFLAGS += $(NOMD_OS_CFLAGS)
+	ifdef USE_MDUPDATE
+		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 	OS_CFLAGS += $(ARCHFLAG)
 else