#3011064

r=mkaply, sr=mkaply (OS/2 only)
Patch from Andy Willis - add _declspec(dllexport/dllimport) for OS/2

config/autoconf.mk.in

@@ -531,7 +531,7 @@ AIX_OBJMODEL = @AIX_OBJMODEL@
 
 # For OS/2 build
 MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
-MOZ_OS2_EMX_OBJECTFORMAT = @MOZ_OS2_EMX_OBJECTFORMAT@
+MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
 
 HAVE_XIE=@HAVE_XIE@
 

config/config.mk

@@ -446,7 +446,7 @@ endif
 # Force _all_ exported methods to be |_declspec(dllexport)| when we're
 # building them into the executable.
 
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq (,$(filter-out WINNT WINCE OS2, $(OS_ARCH)))
 ifdef BUILD_STATIC_LIBS
 DEFINES += \
         -D_IMPL_NS_GFX \

config/rules.mk

@@ -995,18 +995,26 @@ $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
 	echo EXPORTS >> $@
 ifeq ($(IS_COMPONENT),1)
 ifeq ($(HAS_EXTRAEXPORTS),1)
+ifndef MOZ_OS2_USE_DECLSPEC
 	$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
+endif	
 else
 	echo    _NSGetModule >> $@
 endif
 else
+ifndef MOZ_OS2_USE_DECLSPEC
 	$(FILTER) $(OBJS) $(SHARED_LIBRARY_LIBS) >> $@
+endif	
 endif
 	$(ADD_TO_DEF_FILE)
 
+ifdef MOZ_OS2_USE_DECLSPEC
+$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
+else
 $(IMPORT_LIBRARY): $(DEF_FILE)
+endif
 	rm -f $@
-	$(IMPLIB) $@ $(DEF_FILE)
+	$(IMPLIB) $@ $^
 	$(RANLIB) $@
 endif # OS/2
 

configure.in

@@ -1329,7 +1329,7 @@ case "$host" in
     HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     HOST_BIN_SUFFIX=.exe
-    MOZ_FIX_LINK_PATHS='-Wl,$(LIBXUL_DIST)/bin'
+    MOZ_FIX_LINK_PATHS=
     ;;
 
 *-osf*)
@@ -2040,6 +2040,17 @@ case "$target" in
         _DEFINES_CFLAGS="$_DEFINES_CFLAGS -Uunix -U__unix -U__unix__"
         _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__"
 
+        AC_CACHE_CHECK(for __declspec(dllexport),
+           ac_os2_declspec,
+           [AC_TRY_COMPILE([__declspec(dllexport) void ac_os2_declspec(void) {}],
+                           [return 0;],
+                           ac_os2_declspec="yes",
+                           ac_os2_declspec="no")])
+        if test "$ac_os2_declspec" = "yes"; then
+           FILTER='true'
+           MOZ_OS2_USE_DECLSPEC='1'
+        fi
+        
     # Visual Age C++ build
     elif test "$VACPP" = "yes"; then
         MOZ_BUILD_ROOT=`pwd -D`
@@ -7262,7 +7273,7 @@ AC_SUBST(USE_DEPENDENT_LIBS)
 
 AC_SUBST(MOZ_BUILD_ROOT)
 AC_SUBST(MOZ_OS2_TOOLS)
-AC_SUBST(MOZ_OS2_EMX_OBJECTFORMAT)
+AC_SUBST(MOZ_OS2_USE_DECLSPEC)
 
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)