--- ./directory/c-sdk/config/Makefile	Sat Feb  1 11:41:49 2003
+++ ../phoenix/./directory/c-sdk/config/Makefile	Tue Jun  3 18:04:36 2003
@@ -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
+++ ../phoenix/./directory/c-sdk/ldap/libraries/libssldap/Makefile	Tue Jun  3 18:04:37 2003
@@ -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)
--- ./layout/build/Makefile.in	Fri Apr 11 01:23:34 2003
+++ ../phoenix/./layout/build/Makefile.in	Tue Jun  3 19:35:41 2003
@@ -167,11 +167,7 @@
 
 GARBAGE += $(BUILD_DATE)
 
-ifeq ($(OS_ARCH),IRIX)
-ifeq ($(GNU_CXX),1)
-LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
-endif
-endif
+EXTRA_DSO_LDOPTS += -Wl,-LD_LAYOUT:lgot_buffer=120
 
 
 export:: $(BUILD_DATE)