[csw-devel] SF.net SVN: gar:[18458] csw/mgar/pkg/gcc4/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Jun 19 14:42:58 CEST 2012
Revision: 18458
http://gar.svn.sourceforge.net/gar/?rev=18458&view=rev
Author: wahwah
Date: 2012-06-19 12:42:58 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
gcc4/trunk: a patch for Ada and PIC
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch
Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-19 11:45:13 UTC (rev 18457)
+++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-19 12:42:58 UTC (rev 18458)
@@ -26,6 +26,9 @@
# PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# http://gcc.gnu.org/ml/gcc-help/2012-06/msg00158.html
+PATCHFILES += Append-PICFLAG_FOR_TARGET.patch
+
# GIT init takes a long time.
NOGITPATCH ?= 1
@@ -50,60 +53,32 @@
## build options
# http://gcc.gnu.org/install/configure.html
-CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --with-gnu-as
-CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
-CONFIGURE_ARGS += --without-gnu-ld
-CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld
-CONFIGURE_ARGS += --enable-nls
-CONFIGURE_ARGS += --with-included-gettext
-CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-x
-CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX)
CONFIGURE_ARGS += --enable-cloog-backend=isl
CONFIGURE_ARGS += --enable-java-awt=xlib
+CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc
CONFIGURE_ARGS += --enable-libada
CONFIGURE_ARGS += --enable-libssp
+CONFIGURE_ARGS += --enable-nls
CONFIGURE_ARGS += --enable-objc-gc
CONFIGURE_ARGS += --enable-threads=posix
-CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc
+CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
+CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
+CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-gnu-as
+CONFIGURE_ARGS += --with-included-gettext
+CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld
+CONFIGURE_ARGS += --without-gnu-ld
+CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX)
-# there could be some abstractions in gar.conf.mk, but at the moment there
-# aren't so let's specify architectures by hand.
-#
-# // This avoids the sparcv8+ binaries.
-# We no longer avoid sparcv8+ binaries.
-ISA_DEFAULT_sparc = sparcv8plus
-CPU_sparc_32 = v9
-CPU_sparc_64 = v9
-CPU_i386_32 = i386
-CPU_i386_64 = x86-64
-
-
-CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
-
# 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)
-# These flags are passed when gcc is built with gcc.
-# Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific.
-CFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
-CXXFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
-CFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET_$(GARCH))
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET_$(GARCH))
-EXTRA_EXPORTS += CFLAGS_FOR_TARGET
-EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
-
-EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET
-EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET
-
# bash must be used, otherwise:
# http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html
CONFIG_SHELL = /opt/csw/bin/bash
Added: csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch (rev 0)
+++ csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch 2012-06-19 12:42:58 UTC (rev 18458)
@@ -0,0 +1,41 @@
+From 176ff0f9a1016553978d6cf41770703e2ad90958 Mon Sep 17 00:00:00 2001
+From: jakub <jakub at 138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 14 Jun 2012 17:45:53 +0000
+Subject: [PATCH] * gcc-interface/Makefile.in (gnatlib-shared-default): Append
+ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188623 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ada/ChangeLog | 5 +++++
+ gcc/ada/gcc-interface/Makefile.in | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
+index 7e3195a..072a3f2 100644
+--- a/gcc/ada/ChangeLog
++++ b/gcc/ada/ChangeLog
+@@ -1,3 +1,8 @@
++2012-06-14 Jakub Jelinek <jakub at redhat.com>
++
++ * gcc-interface/Makefile.in (gnatlib-shared-default): Append
++ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake.
++
+ 2012-06-14 Release Manager
+
+ * GCC 4.7.1 released.
+diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
+index ee8db38..f9e7eda 100644
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -2597,7 +2597,7 @@ gnatlib-shared-default:
+ $(MAKE) $(FLAGS_TO_PASS) \
+ GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+ GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
+- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
++ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
+ MULTISUBDIR="$(MULTISUBDIR)" \
+ THREAD_KIND="$(THREAD_KIND)" \
+ gnatlib
+--
+1.7.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list