More Sun OS/compiler cleanup

3 files changed, 3 insertions, 89 deletions

diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU
deleted file mode 100644
index 3489fc423e9..00000000000
--- a/ACE/include/makeinclude/platform_linux_suncc.GNU
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# This file should allow ACE to be built on Linux, using the Sun compiler.
-# The Sun compiler on linux is still in the Alpha stage, so no guarantees
-# given at this point
-
-include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU
-
-no_hidden_visibility ?= 1
-
-ifeq ($(insure),0)
-  CC  = CC
-  CXX = CC
-endif
-
-GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION)
-ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION)))
-  CPPFLAGS += -DACE_HAS_LINUX_NPTL
-endif
-
-DCCFLAGS += -g
-DCFLAGS  += -g
-DLD      = $(CXX)
-LD       = $(CXX)
-LIBS     += -ldl
-OCCFLAGS = -O3
-OCFLAGS  = -O3
-PRELIB   = @true
-SOFLAGS  += -shared
-PIC      = -PIC
-
-SOBUILD  = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
-           $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
-ifeq ($(threads),1)
-  CPPFLAGS  += -D_REENTRANT
-  LIBS += -lpthread -lrt
-endif
-
-ifeq ($(optimize),0)
-  # Disable all optimizing in code
-  CPPFLAGS += -O0
-endif
-
-
-ifeq ($(shared_libs), 1)
-  ifneq ($static_libs_only), 1)
-    ifneq ($(no_hidden_visibility),1)
-      CCFLAGS += -fvisibility=hidden
-    else
-      CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
-    endif # no_hidden_visibility
-  endif
-endif
-
-ifeq ($(buildbits),32)
-  CFLAGS   += -m32
-  LDFLAGS  += -m32
-endif
-ifeq ($(buildbits),64)
-  CFLAGS   += -m64
-endif
-
-# Enable GNU extensions
-CPPFLAGS+= -D_GNU_SOURCE
-
-# Added line below to support "Executable Shared Object" files (as
-# needed by the service configurator).
-# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ifeq ($(threads),1)
-    ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
-    ifndef PRELIB
-       PRELIB = @true
-    endif # ! PRELIB
-endif
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index 11283525473..d2da721b3f1 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #----------------------------------------------------------------------------
-#       
+#
 #
 #       Local targets
 #       GNU version
@@ -27,20 +27,9 @@ ifdef TEMPINCDIR
   CLEANUP_DIRS += $(TEMPINCDIR)
 endif
 
-ifdef sun
-  CLEANUP_DIRS += SunWS_cache
-endif
-
 vxworks_ntbuild ?= 0
 lacks_touch ?= 0
 
-#### TEMPLATE_REPOSITORY can be set in individual platform files
-#### to create template repository directories.  See
-#### platform_sunos5_sunc++.GNU for an example.
-ifdef TEMPLATE_REPOSITORY
-CLEANUP_DIRS += $(TEMPLATE_REPOSITORY)
-endif
-
 ifeq ($(use_pwd_call),)
   ifneq ($(mingw32),1)
     use_pwd_call := 0
@@ -369,7 +358,7 @@ ifneq ($(SHLIB_UNCHECKED),)
 	-$(RM) $(SHLIB_UNCHECKED)
 ifeq ($(versioned_so),1)
 	-$(RM) $(SHLIB_UNCHECKED)$(SOVERSION)
-else 
+else
 	ifeq ($(versioned_so),2)
 		-$(RM) $(SHLIB_UNCHECKED:.$(SOEXT)=$(SOVERSION).$(SOEXT))
 	endif
@@ -510,7 +499,7 @@ depend.local: $(MAKEFILE) idl_stubs.local
 	@$(RM) $(DEPENDENCY_FILE).old
 	@cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old
 	$(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(DEPENDENCY_FILE) \
-	$(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) 
+	$(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC)
 	@if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\
 	then echo "GNUmakefile dependencies unchanged." ;\
 	else \
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 9daae9c7640..d815f614662 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -26,7 +26,6 @@
 #                   to CPPFLAGS, PLATFORM_DMALLOC_LDFLAGS to LDFLAGS, and
 #                   PLATFORM_DMALLOC_LIBS to LIBS. For more information on
 #                   dmalloc, see http://dmalloc.com.
-#  fast             Enable -fast option, e.g., with Sun C++.
 #  inline           Enable ACE inlining.  Some platforms enable inlining by
 #                   default, others do not. If platform_macros.GNU does not
 #                   set this, inline is enabled.