[csw-devel] SF.net SVN: gar:[19907] csw/mgar/pkg/gcc4/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 19907
          http://gar.svn.sourceforge.net/gar/?rev=19907&view=rev
Author:   wahwah
Date:     2012-12-18 09:14:55 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
gcc4/trunk: use the GNU assembler on Intel platforms, and Sun assembler on SPARC

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2012-12-18 08:56:19 UTC (rev 19906)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2012-12-18 09:14:55 UTC (rev 19907)
@@ -60,12 +60,8 @@
 CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix
 CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
-#CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
-CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as
 CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
-#CONFIGURE_ARGS += --with-gnu-as
-CONFIGURE_ARGS += --without-gnu-as
 CONFIGURE_ARGS += --with-included-gettext
 CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld
 CONFIGURE_ARGS += --without-gnu-ld
@@ -74,6 +70,16 @@
 CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX)
 
+# Using ccs/bin/bas on x86 results in this problem:
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35531
+ifeq ($(GARCH),sparc)
+CONFIGURE_ARGS += --with-as=/usr/ccs/bin/as
+CONFIGURE_ARGS += --without-gnu-as
+else
+CONFIGURE_ARGS += --with-gnu-as
+CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
+endif
+
 # GCC can't be built in the same directory with the sources.
 # It also can't be built in a subdirectory of the sources.
 OBJDIR          = $(abspath $(WORKDIR)/objdir)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.