--- ./directory/c-sdk/config/Makefile	Sat Feb  1 11:41:49 2003
+++ ../mozilla/./directory/c-sdk/config/Makefile	Wed Feb 25 17:03:52 2004
@@ -92,9 +92,9 @@
     XLDOPTS += $(LDFLAGS)
 endif
 
-ifdef XP_OS2_EMX
+ifeq ($(MOZ_OS2_TOOLS),EMX)
 XCFLAGS = $(OS_EXE_CFLAGS)
-XLDOPTS = -Zlinker /PM:VIO
+XLDOPTS = -Zomf -Zlinker /PM:VIO
 endif
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
@@ -114,7 +114,9 @@
 
 OUTOPTION = -o # end of the line
 ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
+ifndef NS_USE_GCC
 OUTOPTION = /Fe
+endif
 endif
 
 # Redefine MAKE_OBJDIR for just this directory
--- ./directory/c-sdk/ldap/libraries/libssldap/Makefile	Sat Feb  1 11:41:41 2003
+++ ../mozilla/./directory/c-sdk/ldap/libraries/libssldap/Makefile	Wed Feb 25 17:03:54 2004
@@ -92,6 +92,15 @@
 endif
 
 ifeq ($(OS_ARCH), WINNT)
+ifdef NS_USE_GCC
+EXTRA_DLL_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
+	-l$(NSS_LIBNAME)
+ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
+EXTRA_DLL_LIBS += -l$(SOFTOKN_LIBNAME)
+endif
+EXTRA_DLL_LIBS += -l$(SSL_LIBNAME) \
+	-l$(PLC_BASENAME) -l$(PLDS_BASENAME) -l$(NSPR_BASENAME)
+else
 EXTRA_LIBS =wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
             comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
             rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib
@@ -105,6 +114,7 @@
 EXTRA_LIBS += $(dist_libdir)/$(SOFTOKN_LIBNAME).lib
 endif
 EXTRA_LIBS += $(dist_libdir)/$(SSL_LIBNAME).lib
+endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
--- ./xpcom/io/Makefile.in	Thu Jul  3 13:54:36 2003
+++ ../mozilla/./xpcom/io/Makefile.in	Wed Feb 25 22:07:01 2004
@@ -154,6 +154,13 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),IRIX)
+ifndef GNU_CC
+CXXFLAGS        := $(shell echo $(CXXFLAGS) | sed 's/-O[23]/-O1/g' | sed 's/-Ofast/-O1/g')
+endif             
+endif
+
+
 DEFINES		+= -D_IMPL_NS_COM
 
 LOCAL_INCLUDES	= -I..