#215581

r=mkaply, sr=blizzard (platform specific)
Changes to get GCC 3.2.2 working on OS/2 - this set is OS/2 only changes
Also remove some VACPP references

build/Makefile.in

@@ -33,14 +33,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-# Need to copy over weaksyms.omf file from GCC directory
-ifeq ($(MOZ_OS2_TOOLS),EMX)
-weaksyms.omf:
-	$(INSTALL) $(EMX2)/lib/gcc-lib/i386-pc-os2-emx/3.2.1/weaksyms.omf .
-
-export:: weaksyms.omf
-endif
-
 # Install bloaturls.txt file for tinderbox bloat test.
 libs:: bloaturls.txt
 	$(INSTALL) $< $(DIST)/bin

config/config.mk

@@ -677,7 +677,7 @@ endif
 ifdef MOZ_WINCONSOLE
 ifeq ($(MOZ_WINCONSOLE),1)
 ifeq ($(MOZ_OS2_TOOLS),EMX)
-BIN_FLAGS	:= -Zlinker /PM:VIO -Zlinker /Stack:0x30000
+BIN_FLAGS	+= -Zlinker /PM:VIO
 endif
 ifeq ($(OS_ARCH),WINNT)
 WIN32_EXE_LDFLAGS	+= /SUBSYSTEM:CONSOLE
@@ -687,7 +687,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 LDFLAGS += /PM:PM
 endif
 ifeq ($(MOZ_OS2_TOOLS),EMX)
-BIN_FLAGS	:= -Zlinker /PM:PM -Zlinker /Stack:0x30000
+BIN_FLAGS	+= -Zlinker /PM:PM
 endif
 ifeq ($(OS_ARCH),WINNT)
 WIN32_EXE_LDFLAGS	+= /SUBSYSTEM:WINDOWS

dbm/include/mcom_db.h

@@ -190,7 +190,7 @@
 #define LITTLE_ENDIAN   1234
 #endif
 
-#if defined(_WINDOWS) || defined(XP_OS2)
+#if defined(_WINDOWS)
 #ifdef BYTE_ORDER
 #undef BYTE_ORDER
 #endif
@@ -222,14 +222,6 @@
 #define MAXPATHLEN 	1024               
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <os2.h>
-#define	MAXPATHLEN	CCHMAXPATH
-#define	EPERM		EINVAL
-#define	ENOTDIR		EBADPOS
-#define	S_ISDIR(s)	((s) & S_IFDIR)
-#endif
-
 #define	EFTYPE		EINVAL		/* POSIX 1003.1 format errno. */
 
 #ifndef	STDERR_FILENO
@@ -253,7 +245,7 @@ int mkstemp(const char *path);
 PR_END_EXTERN_C
 #endif	/* MACINTOSH */
 
-#if !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2)
+#if !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/stat.h>
 #include <errno.h>
 #endif

extensions/webservices/proxy/tests/Makefile.in

@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= wsproxytest
 LIBRARY_NAME	= wsproxytest
+SHORTLIBNAME	= wsprxtst
 EXPORT_LIBRARY = 1
 XPIDL_MODULE	= wsproxytest
 IS_COMPONENT	= 1