402N/A--- stdcxx-4.2.1/etc/config/GNUmakefile.cfg 2008-04-24 17:25:50.000000000 -0700
402N/A+++ stdcxx-4.2.1/etc/config/GNUmakefile.cfg 2009-07-25 14:57:02.019814635 -0700
402N/A@@ -54,13 +54,22 @@
402N/A #
402N/A ########################################################################
402N/A
402N/A+arch := $(shell mach)
402N/A+
402N/A+ifeq ($(arch),sparc)
402N/A+ XREGS := -xregs=appl
402N/A+ XMEMALIGN := -xmemalign=8i
402N/A+else
402N/A+ XREGS := -xregs=no%frameptr
402N/A+ XMEMALIGN :=
402N/A+endif
402N/A+
402N/A include ../makefile.in
402N/A
402N/A SRCDIR = $(TOPDIR)/etc/config/src
402N/A VPATH = $(SRCDIR)
402N/A
402N/A CPPFLAGS += -I.
402N/A-CPPFLAGS := $(filter-out -I$(TOPDIR)/include/ansi,$(CPPFLAGS))
402N/A
402N/A CXXFLAGS += $(WARNFLAGS)
402N/A
402N/A@@ -74,12 +83,13 @@
402N/A DASH_H = -H
402N/A
402N/A CCNAME = $(CXX)-$(CCVER)
402N/A-LOGFILE = config.log
402N/A+LOGFILE = $(TOPDIR)/config.log
402N/A
402N/A # can't use LDOPTS when working with HP aCC, it's used by the linker
402N/A ifneq ($(CXX),aCC)
402N/A LOPT = LDOPTS
402N/A LDFLAGS += $(LDOPTS)
402N/A+ LDFLAGS += -R$(TOPDIR)/build/include
402N/A else
402N/A LOPT = _LDOPTS
402N/A LDFLAGS += $(_LDOPTS)
402N/A@@ -113,9 +123,9 @@
402N/A # $(2): executable file name
402N/A # $(3): additional linker flags (optional)
402N/A define link
402N/A- command="$(LD) $(1) $(LDFLAGS) $(3) -o $(2)"; \
402N/A+ command="$(CXX) $(CXXFLAGS) $(1) $(LDFLAGS) $(LDOPTS) $(3) -o $(2)"; \
402N/A echo "$$command" >>$(LOGFILE); \
402N/A- $(LD) $(1) $(LDFLAGS) $(3) -o $(2) >>$(LOGFILE) 2>&1
402N/A+ $(CXX) $(CXXFLAGS) $(1) $(LDFLAGS) $(LDOPTS) $(3) -o $(2) >>$(LOGFILE) 2>&1
402N/A endef
402N/A
402N/A # helper function to compile and link a file and log results
402N/A@@ -127,10 +137,10 @@
402N/A # $(5): additional linker flags (optional)
402N/A define compile_then_link
402N/A command="$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(4) -c $(1) -o $(2)" \
402N/A- "&& $(LD) $(2) $(LDFLAGS) $(5) -o $(3)"; \
402N/A+ "&& $(CXX) $(CXXFLAGS) $(2) $(LDFLAGS) $(LDOPTS) $(5) -o $(3)"; \
402N/A echo "$$command" >>$(LOGFILE); \
402N/A $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(4) -c $(1) -o $(2) >>$(LOGFILE) 2>&1 \
402N/A- && $(LD) $(2) $(LDFLAGS) $(5) -o $(3) >>$(LOGFILE) 2>&1
402N/A+ && $(CXX) $(CXXFLAGS) $(2) $(LDFLAGS) $(LDOPTS) $(5) -o $(3) >>$(LOGFILE) 2>&1
402N/A endef
402N/A
402N/A # helper function to prelink a file and log results
402N/A@@ -181,7 +191,7 @@
402N/A if [ $$? -eq 0 ] ; then \
402N/A opts=`sed -n "s/^[^A-Z_a-z0-9]*LDOPTS *= *\(.*\)/\1/p" \
402N/A $$src`; \
402N/A- targets="$$file.o $$file run RUN=$$file $(LOPT)=$$opts"; \
402N/A+ targets="$$file.o $$file run RUN=$$file LDOPTS=$$opts $(LOPT)=$$opts"; \
402N/A elif [ `echo $$file | grep "\.lib"` ] ; then \
402N/A targets="$$file$(LIBSUFFIX)" ; \
402N/A elif [ `echo $$file | grep "\.sh"` ] ; then \