1 files changed, 44 insertions, 31 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 91c59adc0da..dc0deb43d43 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -16,19 +16,6 @@
 VXWORKS = 1
 CROSS-COMPILE = 1
 
-ifneq (,$(HOST_ROOT))
-  TAO_IDL ?= $(HOST_ROOT)/bin/tao_idl$(EXEEXT)
-  TAO_IDL_DEP ?= $(TAO_IDL)
-  TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
-endif
-
-ifeq ("$(OS)", "Windows_NT")
-ifneq ($(MAKE_MODE), unix)
-vxworks_ntbuild = 1
-MKDIR_NTSTYLE = 1
-endif
-endif
-
 debug ?= 1
 optimize ?= 1
 rtti ?= 1
@@ -36,6 +23,8 @@ threads ?= 1
 exceptions ?= 1
 rtp ?= 1
 pthread ?= 1
+xerces ?= 0
+aio ?= 0
 
 ifeq ($(static_libs),1)
   shared_libs = 0
@@ -57,12 +46,30 @@ ifeq (,$(WIND_HOST_TYPE))
 	@ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-ifeq ($(DIAB_HOST_TYPE),)
-ifeq ("$(OS)", "Windows_NT")
-  DIAB_HOST_TYPE = WIN32
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+  vxworks_ntbuild ?= 0
+  mingw32 ?= 1
+  lacks_touch ?= 0
+  PWD=$(subst \,/,$(shell pwd))
+  ACE_ROOT:=$(subst \,/,$(ACE_ROOT))
+  TAO_ROOT:=$(subst \,/,$(TAO_ROOT))
+  CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT))
+endif # x86-win32
+
+ifneq (,$(HOST_ROOT))
+TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf
+ifeq ("$(WIND_HOST_TYPE)","x86-win32")
+  TAO_IDL = $(HOST_ROOT)/bin/tao_idl.exe
+  TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2.exe
+  CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc.exe
 else
-  DIAB_HOST_TYPE = UNIX
+  TAO_IDL = $(HOST_ROOT)/bin/tao_idl
+  TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2
+  CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc
 endif
+TAO_IDL_DEP = $(TAO_IDL)
+TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
+CIDLC_DEP = $(CIDLC)
 endif
 
 HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
@@ -173,6 +180,13 @@ ifeq ($(rtp),1)
   include $(WIND_USR)/make/defs.$(WIND_HOST_TYPE)
   ifeq ("$(TOOL_FAMILY)","gnu")
     CPPFLAGS += -mrtp
+    SOFLAGS += -mrtp
+  endif
+  ifeq ($(SHARED_LIBS), 1)
+    ifeq ($(aio),1)
+      CPPFLAGS += -DACE_HAS_AIO_CALLS
+      LIBS += AioPx
+    endif
   endif
   LDFLAGS := $(filter-out -X, $(LDFLAGS))
   LDFLAGS := $(filter-out -N, $(LDFLAGS))
@@ -183,7 +197,6 @@ ifeq ($(rtp),1)
   else
     LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common
   endif
-  LDLIBS += -ldl
 else
   include $(TGT_DIR)/h/make/defs.default
   include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE)
@@ -191,6 +204,18 @@ else
   include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 endif
 
+ifeq ($(SHARED_LIBS), 1)
+ifeq ("$(TOOL_FAMILY)","gnu")
+  PIC = -fpic
+  SOFLAGS += -fpic -shared
+  LDFLAGS += -non-static
+else
+  PIC = -Xpic
+  SOFLAGS += -Xshared
+  LDFLAGS += -Xdynamic
+endif
+endif
+
 ## make sure we don't use that stupid, crippled vxrm.bat script.
 override RM=rm -f
 
@@ -296,7 +321,7 @@ endif
 endif # rtti
 
 ifeq ("$(TOOL_FAMILY)","diab")
-  LDLIBS += -lstlstd
+  LIBS += -lstlstd
 endif
 
 ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),)
@@ -319,18 +344,6 @@ endif
 
 CCFLAGS         += $(C++FLAGS)
 
-ifeq (0,$(rtp))
-PIC              =
-else
-  ifeq ("$(TOOL_FAMILY)","diab")
-    PIC = -Xpic
-  else
-  ifeq ("$(TOOL_FAMILY)","gnu")
-    PIC = -fpic
-  endif
-endif
-endif
-
 ifeq ("$(VXWORKSLINK)","true")
 
   ifdef repo