stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r290311 - in /incubator/stdcxx/trunk: ./ etc/config/ src/ src/i86/ src/ia64/ src/parisc/ src/sparc/
Date Mon, 19 Sep 2005 23:39:39 GMT
Author: sebor
Date: Mon Sep 19 16:39:25 2005
New Revision: 290311

URL: http://svn.apache.org/viewcvs?rev=290311&view=rev
Log:
2005-09-19  Martin Sebor  <sebor@roguewave.com>

	STDCXX-14 (part 1)
	* src/atomic-i86.s: Renamed to...
	* src/i86/atomic.s: ...this.
	* src/atomic-ia64.s: Renamed to...
	* src/ia64/atomic.s: ...this.
	* src/atomic-pa2.s: Renamed to...
	* src/parisc/atomic.s:  ...this.
	* src/atomic-pa2-64.s: Renamed to...
	* src/parisc/atomic-64.s: ...this.
	* src/atomic-sparc.s: Renamed to...
	* src/sparc/atomic.s: ...this.
	* src/atomic-sparc64.s Renamed to...
	* src/sparc/atomic-64.s: ...this.
	* src/atomic.s: Changed the names of included files according
	to the above.
	* GNUmakefile: Introduced the AS_EXT variable and set it to.S by
	default (unless already defined in the .config file).
	* makefile.common: Replaced platform-specific hackery with a more
	general handling of assembly files.
	* makefile.rules: Introduced the AS_EXT variable into the %.o: %.s
	suffix rule and guarded the whole thing against expanding when AS_EXT
	is not defined or valid.
	* acc.config: Defined AS_EXT to .s.
	* mipspro.config: Same.
	* vacpp.config: Defined AS_EXT to an invalid value on AIX to prevent
	the assembly of .{S,s} files (Linux will use the default extension
	defined in GNUmakefile).
	* eccp.config: Defined AS_EXT to an invalid value to disable the
	processing of assembly files until a solution to invoke the system
	assembler is implemented.


Added:
    incubator/stdcxx/trunk/src/i86/
    incubator/stdcxx/trunk/src/i86/atomic.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-i86.s
    incubator/stdcxx/trunk/src/ia64/
    incubator/stdcxx/trunk/src/ia64/atomic.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-ia64.s
    incubator/stdcxx/trunk/src/parisc/
    incubator/stdcxx/trunk/src/parisc/atomic-64.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-pa2-64.s
    incubator/stdcxx/trunk/src/parisc/atomic.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-pa2.s
    incubator/stdcxx/trunk/src/sparc/
    incubator/stdcxx/trunk/src/sparc/atomic-64.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-sparc64.s
    incubator/stdcxx/trunk/src/sparc/atomic.s
      - copied, changed from r290002, incubator/stdcxx/trunk/src/atomic-sparc.s
Removed:
    incubator/stdcxx/trunk/src/atomic-i86.s
    incubator/stdcxx/trunk/src/atomic-ia64.s
    incubator/stdcxx/trunk/src/atomic-pa2-64.s
    incubator/stdcxx/trunk/src/atomic-pa2.s
    incubator/stdcxx/trunk/src/atomic-sparc.s
    incubator/stdcxx/trunk/src/atomic-sparc64.s
Modified:
    incubator/stdcxx/trunk/GNUmakefile
    incubator/stdcxx/trunk/etc/config/acc.config
    incubator/stdcxx/trunk/etc/config/eccp.config
    incubator/stdcxx/trunk/etc/config/makefile.common
    incubator/stdcxx/trunk/etc/config/makefile.rules
    incubator/stdcxx/trunk/etc/config/mipspro.config
    incubator/stdcxx/trunk/etc/config/vacpp.config
    incubator/stdcxx/trunk/src/atomic.s

Modified: incubator/stdcxx/trunk/GNUmakefile
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/GNUmakefile?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Mon Sep 19 16:39:25 2005
@@ -393,6 +393,12 @@
     LD = $(CXX)
   endif
 
+  ifeq ($(AS_EXT),)
+    # assume the .S extension for assembly files by default,
+    # unless specified otherwise in the config file
+    AS_EXT = ".S"
+  endif
+
   # debug/optimized
   ifeq ($(findstring debug,$(BUILDMODE)),debug)
     CXXFLAGS += $(DEBUG_CXXFLAGS)
@@ -556,6 +562,7 @@
           && echo "CPPFLAGS   = $(CPPFLAGS)"             >> $(MAKEFILE_IN)
 \
           && echo "WARNFLAGS  = $(WARNFLAGS)"            >> $(MAKEFILE_IN)
 \
           && echo "DEPENDFLAGS = $(DEPENDFLAGS)"         >> $(MAKEFILE_IN)
 \
+          && echo "AS_EXT     = $(AS_EXT)"               >> $(MAKEFILE_IN)
 \
           && echo "LD         = $(LD)"                   >> $(MAKEFILE_IN)
 \
           && echo "LDFLAGS    = $(LDFLAGS)"              >> $(MAKEFILE_IN)
 \
           && echo "LDLIBS     = $(LDLIBS)"               >> $(MAKEFILE_IN)
 \

Modified: incubator/stdcxx/trunk/etc/config/acc.config
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/acc.config?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/acc.config (original)
+++ incubator/stdcxx/trunk/etc/config/acc.config Mon Sep 19 16:39:25 2005
@@ -1,5 +1,5 @@
 #
-# $Id: //stdlib/dev/etc/stdlib/config/acc.config#5 $
+# $Id$
 #
 # configuration file for HP aCC on HP-UX
 #
@@ -45,6 +45,9 @@
 
 PICFLAGS        = +Z
 LDSOFLAGS       = +Z -b
+
+# the extension of assembly files is .s
+AS_EXT = .s
 
 # $(_CPPOPTS), $(_CXXOPTS), and $(_LDOPTS) provided to allow for modification
 # of the respective variables w/o underscores on HP-UX where the latter are

Modified: incubator/stdcxx/trunk/etc/config/eccp.config
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/eccp.config?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/eccp.config (original)
+++ incubator/stdcxx/trunk/etc/config/eccp.config Mon Sep 19 16:39:25 2005
@@ -1,5 +1,5 @@
 #
-# $Id: //stdlib/dev/etc/stdlib/config/eccp.config#18 $
+# $Id$
 #
 # configuration file for EDG eccp
 #
@@ -41,6 +41,11 @@
 DEPENDFLAGS     = -M
 PICFLAGS        = 
 PRELINKFLAGS    = --prelink_objects
+
+# disable assembly files for now, eccp doesn't understand them
+# (until the makefiles are changed to use the system assembler
+# to assemble such files)
+AS_EXT = .
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g

Modified: incubator/stdcxx/trunk/etc/config/makefile.common
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/makefile.common?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.common (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.common Mon Sep 19 16:39:25 2005
@@ -22,8 +22,7 @@
 ifeq ($(ONE_REPOSITORY),)
 
   # traverse all subdirectories and get the names of all regular files
-  # avoiding any hidden subdirectories
-  ALL_FILES = $(shell $(FIND) $(SRCDIRS) -type f -o -name ".*" -prune)
+  ALL_FILES = $(shell $(FIND) $(SRCDIRS) -type f -print)
 
   ifneq ($(CXX_REPOSITORY),)
 
@@ -74,31 +73,13 @@
   # ignore subdirectories when building a library
   ALL_FILES := $(shell echo $(SRCDIRS)/*.cpp)
 
-  # do not use assembly source files containing atomic ops
-  # with EDG's eccp or with AIX xlC
-  ifneq ($(CXX),eccp)
-    ifeq ($(findstring xlC,$(CXX)),)
-
-      ifeq ($(CXX),aCC)
-        # with HP aCC use atomic.s instead of atomic.S
-        ATOMIC_S += $(shell echo $(SRCDIRS)/atomic.s)
-        AS_EXT    = s
-      else
-        # testing for platform is not the best solution here
-        # but it will have to do
-        ifeq (IRIX64,$(findstring IRIX64,$(PLATFORM)))
-          ATOMIC_S += $(shell echo $(SRCDIRS)/atomic.s)
-          AS_EXT    = s
-        else
-          ATOMIC_S += $(shell echo $(SRCDIRS)/atomic.S)
-          AS_EXT    = S
-        endif   # IRIX
-      endif   # HP aCC
-    endif   # not IBM VisualAge
-  endif   # not EDG eccp
-
-  ifneq ($(ATOMIC_S),)
-    ALL_FILES += $(shell [ -r $(ATOMIC_S) ] && echo $(ATOMIC_S))
+  # if the assembly file extension is non-empty and not the dot,
+  # add all files with that extension to the list of files to
+  # compile
+  ifneq ($(AS_EXT),"")
+    ifneq ($(AS_EXT),".")   # special value -- ignore atomic
+     ALL_FILES += $(shell echo $(SRCDIRS)/*$(AS_EXT))	
+    endif
   endif
 endif
 

Modified: incubator/stdcxx/trunk/etc/config/makefile.rules
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/makefile.rules?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.rules (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.rules Mon Sep 19 16:39:25 2005
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: //stdlib/dev/etc/stdlib/config/makefile.rules#33 $
+# $Id$
 #
 # common makefile rules shared by all GNUmakefile.*
 # 
@@ -63,9 +63,15 @@
 # compile and link in one or two steps
 ifeq ($(NO_DOT_O),)
 
-%.o: %.$(AS_EXT)
+  ifneq ($(AS_EXT),)
+    ifneq ($(AS_EXT),".")
+
+%.o: %$(AS_EXT)
 	@echo  "$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<" >> $(LOGFILE)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< $(TEEOPTS)
+
+    endif   # ifneq ($(AS_EXT),".")
+  endif   # ifneq ($(AS_EXT),)
 
 %.o: %.cpp
 	@echo "$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<" >> $(LOGFILE)

Modified: incubator/stdcxx/trunk/etc/config/mipspro.config
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/mipspro.config?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/mipspro.config (original)
+++ incubator/stdcxx/trunk/etc/config/mipspro.config Mon Sep 19 16:39:25 2005
@@ -1,5 +1,5 @@
 #
-# $Id: //stdlib/dev/etc/stdlib/config/mipspro.config#7 $
+# $Id$
 #
 # configuration file for MIPSpro on IRIX
 #
@@ -23,6 +23,8 @@
 # disable warnings about libs that aren't being used to resolve any symbols
 LDFLAGS         = -Wl,-woff,84 -L$(LIBDIR)
 
+# the extension of assembly files is .s
+AS_EXT = .s
 
 # debug/optimization options
 DEBUG_CXXFLAGS  = -g

Modified: incubator/stdcxx/trunk/etc/config/vacpp.config
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/vacpp.config?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/vacpp.config (original)
+++ incubator/stdcxx/trunk/etc/config/vacpp.config Mon Sep 19 16:39:25 2005
@@ -1,5 +1,5 @@
 #
-# $Id: //stdlib/dev/etc/stdlib/config/vacpp.config#10 $
+# $Id$
 #
 # configuration file for xlc on AIX
 #
@@ -71,6 +71,10 @@
     PRELINKFLAGS += -Wl,-bh:5
     LDFLAGS      += -Wl,-bh:5
   endif
+
+  # disable assembly files on AIX but leave them enabled (at the default
+  # setting) elsewhere (e.g., Linux)
+  AS_EXT = .
 
 else
   # position-dependent code necessary on Linux only

Modified: incubator/stdcxx/trunk/src/atomic.s
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/atomic.s?rev=290311&r1=290310&r2=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic.s (original)
+++ incubator/stdcxx/trunk/src/atomic.s Mon Sep 19 16:39:25 2005
@@ -21,29 +21,25 @@
 
 
 #if defined (__i386__)
-#  include "atomic-i86.s"
+#  include "i86/atomic.s"
 #endif
 
-#if defined (__ia64) || defined (__ia64__)
-#  if defined (_LP64) || defined (__LP64__)
-#    include "atomic-ia64.s"
-#  else
-#    include "atomic-ia64-32.s"
-#  endif
+#if defined (__ia64)
+#  include "ia64/atomic.s"
 #endif
 
 #if defined (__parisc)
 #  if defined (__LP64__)
-#    include "atomic-pa2-64.s"
+#    include "parisc/atomic-64.s"
 #  else
-#    include "atomic-pa2.s"
+#    include "parisc/atomic.s"
 #  endif
 #endif 
 
 #if defined (__sparc)
 #  if defined (__sparcv9)
-#    include "atomic-sparc64.s"
+#    include "sparc/atomic-64.s"
 #  else
-#    include "atomic-sparc.s"
+#    include "sparc/atomic.s"
 #  endif
 #endif 

Copied: incubator/stdcxx/trunk/src/i86/atomic.s (from r290002, incubator/stdcxx/trunk/src/atomic-i86.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/i86/atomic.s?p2=incubator/stdcxx/trunk/src/i86/atomic.s&p1=incubator/stdcxx/trunk/src/atomic-i86.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-i86.s (original)
+++ incubator/stdcxx/trunk/src/i86/atomic.s Mon Sep 19 16:39:25 2005
@@ -2,7 +2,7 @@
  *
  * atomic-i86.s
  *
- * $Id: //stdlib/dev/source/stdlib/atomic-i86.s#16 $
+ * $Id$
  *
  ***************************************************************************
  *

Copied: incubator/stdcxx/trunk/src/ia64/atomic.s (from r290002, incubator/stdcxx/trunk/src/atomic-ia64.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/ia64/atomic.s?p2=incubator/stdcxx/trunk/src/ia64/atomic.s&p1=incubator/stdcxx/trunk/src/atomic-ia64.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-ia64.s (original)
+++ incubator/stdcxx/trunk/src/ia64/atomic.s Mon Sep 19 16:39:25 2005
@@ -2,7 +2,7 @@
 //
 // atomic-ia64.s
 //
-// $Id: //stdlib/dev/source/stdlib/atomic-ia64.s#3 $
+// $Id$
 //
 ////////////////////////////////////////////////////////////////////////////
 //

Copied: incubator/stdcxx/trunk/src/parisc/atomic-64.s (from r290002, incubator/stdcxx/trunk/src/atomic-pa2-64.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/parisc/atomic-64.s?p2=incubator/stdcxx/trunk/src/parisc/atomic-64.s&p1=incubator/stdcxx/trunk/src/atomic-pa2-64.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-pa2-64.s (original)
+++ incubator/stdcxx/trunk/src/parisc/atomic-64.s Mon Sep 19 16:39:25 2005
@@ -2,7 +2,7 @@
  *
  * atomic-pa2-64.s
  *
- * $Id: //stdlib/dev/source/stdlib/atomic-pa2-64.s#6 $
+ * $Id$
  *
  ***************************************************************************
  *

Copied: incubator/stdcxx/trunk/src/parisc/atomic.s (from r290002, incubator/stdcxx/trunk/src/atomic-pa2.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/parisc/atomic.s?p2=incubator/stdcxx/trunk/src/parisc/atomic.s&p1=incubator/stdcxx/trunk/src/atomic-pa2.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-pa2.s (original)
+++ incubator/stdcxx/trunk/src/parisc/atomic.s Mon Sep 19 16:39:25 2005
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id: //stdlib/dev/source/stdlib/atomic-pa2.s#10 $
+ * $Id$
  *
  * Routines for atomic increment and decrement of int32_t values
  *

Copied: incubator/stdcxx/trunk/src/sparc/atomic-64.s (from r290002, incubator/stdcxx/trunk/src/atomic-sparc64.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/sparc/atomic-64.s?p2=incubator/stdcxx/trunk/src/sparc/atomic-64.s&p1=incubator/stdcxx/trunk/src/atomic-sparc64.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-sparc64.s (original)
+++ incubator/stdcxx/trunk/src/sparc/atomic-64.s Mon Sep 19 16:39:25 2005
@@ -2,7 +2,7 @@
 !
 ! atomic-sparc64.s
 !
-! $Id: //stdlib/dev/source/stdlib/atomic-sparc64.s#10 $
+! $Id$
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Copied: incubator/stdcxx/trunk/src/sparc/atomic.s (from r290002, incubator/stdcxx/trunk/src/atomic-sparc.s)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/src/sparc/atomic.s?p2=incubator/stdcxx/trunk/src/sparc/atomic.s&p1=incubator/stdcxx/trunk/src/atomic-sparc.s&r1=290002&r2=290311&rev=290311&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/atomic-sparc.s (original)
+++ incubator/stdcxx/trunk/src/sparc/atomic.s Mon Sep 19 16:39:25 2005
@@ -2,7 +2,7 @@
 !
 ! atomic-sparc.s
 !
-! $Id: //stdlib/dev/source/stdlib/atomic-sparc.s#11 $
+! $Id$
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !



Mime
View raw message