21459215 introduce ClooG in Solaris
authorStefan Teleman <stefan.teleman@oracle.com>
Thu, 28 Jan 2016 10:36:09 -0800
changeset 5359 57359db17e2a
parent 5358 fe333c2ff3dc
child 5360 af56e129673d
21459215 introduce ClooG in Solaris
components/cloog/Makefile
components/cloog/Solaris/cloog-isl.pc
components/cloog/cloog.license
components/cloog/cloog.p5m
components/cloog/patches/000-test-environment-vars.patch
components/cloog/patches/006-checker.sh.patch
components/cloog/patches/007-test-isl-jacobi-shared.c.patch
components/cloog/patches/008-test-reservoir-QR.c.patch
components/cloog/patches/009-configure.patch
components/cloog/test/results-cloog.master
components/gcc47/Makefile
components/gcc48/Makefile
components/gcc49/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/Makefile	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,168 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+COMPILER=gcc
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		cloog
+COMPONENT_VERSION=	0.18.3
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL=	http://www.cloog.org/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734
+COMPONENT_ARCHIVE_URL=	http://www.bastoul.net/cloog/pages/download/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	library/cloog
+
+TPNO=			23800
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL := 0
+PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris
+PATH="/usr/gnu/bin:/usr/perl5/bin:/usr/bin:/usr/sbin"
+
+# Don't use SSE3 or SSSE3 on Intel, because it's not completely portable.
+# Do not tell GCC to assume strictly correct pointer aliasing. CLooG
+# employs casts from incompatible pointer types.
+# General-purpose SPARC incantations:
+# - build for UltraSPARC-III (use fp registers for int whenever possible)
+# - use VIS-2 Instructions whenever possible
+# - there are no misaligned doubles in this code
+# - don't do software float (we're not using quat-precision).
+CLOOG_GCC_ARCH_i386 = -mtune=opteron -march=opteron -mno-sse3 -mno-ssse3
+CLOOG_GCC_ARCH_i386 += -fno-omit-frame-pointer -fno-strict-aliasing
+CLOOG_GCC_ARCH_sparc = -mtune=ultrasparc3 -mcpu=ultrasparc3 -mvis2 -mhard-float
+CLOOG_GCC_ARCH_sparc += -fno-strict-aliasing -mno-unaligned-doubles
+CLOOG_GCC_ARCH = $(CLOOG_GCC_ARCH_$(MACH))
+CLOOG_GCC_ARCH += -Wall -Wextra -Wcast-qual -Wcast-align
+
+CFLAGS = $(CC_BITS)
+CFLAGS += -O2 -std=c99
+CFLAGS += -D__C99FEATURES__
+CFLAGS += -D_STDC_C99
+CFLAGS += $(CPP_XPG6MODE)
+CFLAGS += $(CLOOG_GCC_ARCH)
+CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align
+
+CXXFLAGS = $(CC_BITS)
+CXXFLAGS += -O2 -std=c++03
+CXXFLAGS += $(CPP_XPG5MODE)
+CXXFLAGS += $(CLOOG_GCC_ARCH)
+CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align
+
+CPPFLAGS += $(CPP_LARGEFILES)
+CPPFLAGS += `pkg-config --cflags libgmp`
+CPPFLAGS += `pkg-config --cflags libmpfr`
+CPPFLAGS += `pkg-config --cflags isl`
+
+CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_ENV +=	CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_ENV +=	CPPFLAGS="$(CPPFLAGS)"
+CONFIGURE_ENV +=	LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ENV +=	LD_OPTIONS="$(LD_OPTIONS)"
+CONFIGURE_ENV +=	CCLD="$(CC) $(CFLAGS) $(LDFLAGS)"
+CONFIGURE_ENV +=	LIBS="$(LIBS)"
+CONFIGURE_ENV +=	PATH="$(PATH)"
+
+COMPONENT_BUILD_ENV += LD_OPTIONS="$(LD_OPTIONS)"
+
+CONFIGURE_OPTIONS  +=		--localstatedir=/var
+CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS  +=		--enable-shared
+CONFIGURE_OPTIONS  +=		--disable-silent-rules
+CONFIGURE_OPTIONS  +=		--disable-libtool-lock
+CONFIGURE_OPTIONS  +=		--with-gcc-arch="$(CLOOG_GCC_ARCH)"
+CONFIGURE_OPTIONS  +=		--with-isl=system
+CONFIGURE_OPTIONS  +=		--with-isl-prefix=$(CONFIGURE_PREFIX)
+CONFIGURE_OPTIONS  +=		--with-gmp=system
+CONFIGURE_OPTIONS  +=		--with-gmp-prefix=$(CONFIGURE_PREFIX)
+
+COMPONENT_POST_INSTALL_ACTION = \
+  ( cd $(PROTOUSRDIR) ; \
+    $(MKDIR) $(PROTOUSRLIBDIR)/pkgconfig ; \
+    $(CP) $(COMPONENT_DIR)/Solaris/cloog-isl.pc \
+      $(PROTOUSRLIBDIR)/pkgconfig/ ; \
+    $(GSED) -i 's^LIBDIR^$(USRLIBDIR)^g' \
+      $(PROTOUSRLIBDIR)/pkgconfig/cloog-isl.pc ; \
+    $(MKDIR) $(PROTOUSRLIBDIR64)/pkgconfig ; \
+    $(CP) $(COMPONENT_DIR)/Solaris/cloog-isl.pc \
+      $(PROTOUSRLIBDIR64)/pkgconfig/ ; \
+    $(GSED) -i 's^LIBDIR^$(USRLIBDIR64)^g' \
+      $(PROTOUSRLIBDIR64)/pkgconfig/cloog-isl.pc )
+
+COMPONENT_TEST_ENV +=   libtool_install_magic='%%%MAGIC variable%%%'
+COMPONENT_TEST_ENV +=   libtool_execute_magic='%%%MAGIC variable%%%'
+COMPONENT_TEST_ENV +=	$(TEST_PATH)
+COMPONENT_TEST_ENV +=	$(TARGET_ENV)
+
+ASLR_MDOE=$(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_MASTER = \
+        $(COMPONENT_TEST_RESULTS_DIR)/results-cloog.master
+
+COMPONENT_TEST_TRANSFORMS += \
+     '-e "/libtool/d"' \
+     '-e "/-m32/d"' \
+     '-e "/-m64/d"' \
+     '-e "/ld: warning/d"' \
+     '-e "/warning/d"' \
+     '-e "/prototype:/d"' \
+     '-e "/argument/d"' \
+     '-e "/Entering/d"' \
+     '-e "/Leaving/d"' \
+     '-e "/check-TESTS/d"' \
+     '-e "/all-recursive/d"' \
+     '-e "/Making all/d"' \
+     '-e "/Making check/d"' \
+     '-e "/gnu/d"' \
+     '-e "/Nothing to be done/d"' \
+     '-e "/is up to date/d"' \
+     '-e "s/[0-9]\{1,\}\.[0-9]\{1,\} s, //g"' \
+     '-e "s^[0-9]\{1,\} kB/s^^g"'  \
+     '-e "s^[0-9]\{1,\}  kB/s^^g"'  \
+     '-e "s^[0-9]\{1,\}\.[0-9]\{1,\}  MB/s^^g"' \
+     '-e "s^[0-9]\{1,\}\.[0-9]\{1,\} MB/s^^g"' \
+     '-e "s/([0-9]\{1,\} B)//g"' \
+     '-e "s/([0-9]\{1,\}  B)//g"' \
+     '-e "s/copied,/copied/g"'  \
+     '-e "s/ \{1,\}copied/ copied/g"'  \
+     '-e "s/copied $$/copied/g"'  \
+     '-e "s/copied [0-9]\{1,\}\./copied/g"'
+
+build: $(BUILD_32_and_64)
+
+install: $(INSTALL_32_and_64)
+
+test: $(TEST_32_and_64)
+
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
+
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += library/isl
+REQUIRED_PACKAGES += system/library
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/Solaris/cloog-isl.pc	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,18 @@
+prefix=/usr
+exec_prefix=${prefix}
+bindir=/usr/bin
+libdir=LIBDIR
+datarootdir=${prefix}/share
+datadir=${datarootdir}
+sysconfdir=${prefix}/etc
+includedir=${prefix}/include
+package=cloog-isl
+suffix=
+
+Name: cloog-isl
+Description: The Chunky LOOp Generator Library
+Version: 0.18.3
+Requires: 
+Libs: -lcloog-isl -lgmp
+Cflags: -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L -D_POSIX_PTHREAD_SEMANTICS -DCLOOG_INT_GMP=1 -I/usr/include/gmp
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/cloog.license	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,459 @@
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/cloog.p5m	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,75 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="CLooG - The Chunky LOOp Generator "
+set name=pkg.description \
+    value="A code generator library for scanning Z-polyhedra"
+set name=com.oracle.info.description \
+    value="A code generator library for scanning Z-polyhedra"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2015/405
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file usr/bin/$(MACH64)/cloog path=usr/bin/cloog
+file path=usr/include/cloog/block.h
+file path=usr/include/cloog/clast.h
+file path=usr/include/cloog/cloog.h
+file path=usr/include/cloog/constraints.h
+file path=usr/include/cloog/domain.h
+file path=usr/include/cloog/input.h
+file path=usr/include/cloog/int.h
+file path=usr/include/cloog/isl/backend.h
+file path=usr/include/cloog/isl/cloog.h
+file path=usr/include/cloog/isl/constraintset.h
+file path=usr/include/cloog/isl/domain.h
+file path=usr/include/cloog/loop.h
+file path=usr/include/cloog/matrix.h
+file path=usr/include/cloog/matrix/constraintset.h
+file path=usr/include/cloog/names.h
+file path=usr/include/cloog/options.h
+file path=usr/include/cloog/pprint.h
+file path=usr/include/cloog/program.h
+file path=usr/include/cloog/state.h
+file path=usr/include/cloog/statement.h
+file path=usr/include/cloog/stride.h
+file path=usr/include/cloog/union_domain.h
+file path=usr/include/cloog/util.h
+file path=usr/include/cloog/version.h
+link path=usr/lib/$(MACH64)/libcloog-isl.so target=libcloog-isl.so.4.0.0
+link path=usr/lib/$(MACH64)/libcloog-isl.so.4 target=libcloog-isl.so.4.0.0
+file path=usr/lib/$(MACH64)/libcloog-isl.so.4.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/cloog-isl.pc
+link path=usr/lib/libcloog-isl.so target=libcloog-isl.so.4.0.0
+link path=usr/lib/libcloog-isl.so.4 target=libcloog-isl.so.4.0.0
+file path=usr/lib/libcloog-isl.so.4.0.0
+file path=usr/lib/pkgconfig/cloog-isl.pc
+license cloog.license license=LGPLv2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/patches/000-test-environment-vars.patch	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,125 @@
+# 'magic' environment variable needs to be set so that the
+# CLooG Test Harness runs correctly. The CLooG tests depend
+# on this environment variable being set sometimes, or not
+# being set at other times.
+# LD_LIBRARY_PATH environment variable must be set, but
+# must also be empty.  The CLooG tests depend on this
+# being set this way.
+--- test/check_c.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_c.sh	2015-07-23 10:00:26.562570533 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,4 +35,11 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
++export libtool_install_magic='not set'
++export libtool_execute_magic='not set'
++
+ $CHECKER "C" "$CLOOGTEST_C" "" "cloog" "c" "${1:-generate}"
+--- test/check_fortran.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_fortran.sh	2015-07-23 10:00:41.949114951 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,4 +35,11 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
++export libtool_install_magic='not set'
++export libtool_execute_magic='not set'
++
+ $CHECKER "FORTRAN" "$CLOOGTEST_FORTRAN" "" "cloog" "f" "${1:-generate}"
+--- test/check_openscop.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_openscop.sh	2015-07-23 10:00:51.413181462 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,4 +35,8 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
+ $CHECKER "OPENSCOP" "$CLOOGTEST_OPENSCOP" "-openscop" "scop" "c" "${1:-generate}"
+--- test/check_run.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_run.sh	2015-07-23 10:01:04.599143341 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,6 +35,10 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
+ # Refactor $SPECIAL_OPTIONS list to remove quotes and to replace spaces in
+ # individual tests with %, e.g., "'file1 -f -1' 'file2'" becomes
+ # "file1%-f%-1 file2".
+--- test/check_special.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_special.sh	2015-07-23 10:01:18.603448457 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,6 +35,13 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
++export libtool_install_magic='not set'
++export libtool_execute_magic='not set'
++
+ # Refactor $SPECIAL_OPTIONS list to remove quotes and to replace spaces in
+ # individual tests with %, e.g., "'file1 -f -1' 'file2'" becomes
+ # "file1%-f%-1 file2".
+--- test/check_strided.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/check_strided.sh	2015-07-23 10:14:06.874535127 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,4 +35,11 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++export LD_LIBRARY_PATH=""
++
++export libtool_install_magic='not set'
++export libtool_execute_magic='not set'
++
+ $CHECKER "STRIDED" "$CLOOGTEST_STRIDED" "-strides 1" "cloog" "c" "${1:-generate}"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/patches/006-checker.sh.patch	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,41 @@
+# These environment avariables must be explicitly set to be
+# empty, otherwise the CLooG test harness does not run correctly.
+--- test/checker.sh	2014-12-08 02:05:37.000000000 -0800
++++ test/checker.sh	2015-07-23 10:01:46.415187505 -0700
[email protected]@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash --noprofile
+ #
+ #   /**-------------------------------------------------------------------**
+ #    **                              CLooG                                **
[email protected]@ -35,6 +35,20 @@
+ # *                                                                           *
+ # *****************************************************************************/
+ 
++set -o posix
++export PATH="/usr/gnu/bin:/usr/bin:.:/usr/sbin"
++#
++# Avoid "unbound variable" error messages from bash.
++#
++export EXEEXT=""
++export TEST_NAME=""
++export TEST_FILES=""
++export TEST_GLOBAL_OPTIONS=""
++export TEST_INPUT_EXTENSION=""
++export TEST_OUTPUT_EXTENSION=""
++export TEST_TYPE=""
++export LD_LIBRARY_PATH=""
++
+ # This is the main test script of CLooG. It checks that CLooG generates
+ # a convenient output for an input set of tests, according to some
+ # parameters (see below). Two checking policies are possible: simply
[email protected]@ -67,6 +81,9 @@
+                            ## - "run" if the checking policy is to generate,
+                            ##   compile and run, generate only otherwise
+ 
++export TEST_NAME TEST_FILES TEST_GLOBAL_OPTIONS TEST_INPUT_EXTENSION \
++  TEST_OUTPUT_EXTENSION TEST_TYPE
++
+ failedtest=0;
+ cloog=$top_builddir/cloog$EXEEXT
+ echo "             /*-----------------------------------------------*"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/patches/007-test-isl-jacobi-shared.c.patch	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,16 @@
+# This is a secmantically insignificant patch to the test harness.
+# However, and without it, for this specific version of CLooG,
+# this test will fail.
+# No need to send upstream, they already know about it.
+# Also see 008-test-reservoir-QR.c.patch in this directory
+--- test/isl/jacobi-shared.c	2014-12-08 05:05:37.000000000 -0500
++++ test/isl/jacobi-shared.c	2015-07-23 14:31:33.978548894 -0400
[email protected]@ -3,7 +3,7 @@
+   if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(g1+t0-3,16) >= -N+g1+t0+1) && (32*floord(t1-1,32) >= -N+g2+t1+1) && (32*floord(g2+t1-3,32) >= t1-32)) {
+     for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) {
+       for (c1=-32*floord(t1-1,32)+t1;c1<=min(32,N-g2-1);c1+=32) {
+-        if (c1 >= 1) {
++        if ((c1 >= 1) && (c1 <= 32)) {
+           S1((c0+g1-1),(c1+g2-1));
+         }
+       }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/patches/008-test-reservoir-QR.c.patch	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,32 @@
+# Known - and irrelevant - bug:
+# https://groups.google.com/forum/?hl=en#!topic/cloog-development/6I0SAXhIr8s
+# No need to send upstream, they already know about it.
+# Internal patch.
+--- test/reservoir/QR.c	2014-12-08 05:05:37.000000000 -0500
++++ test/reservoir/QR.c	2015-07-23 14:34:54.994624981 -0400
[email protected]@ -1,12 +1,6 @@
+ /* Generated from ./reservoir/QR.cloog by CLooG 0.18.1-2-g43fc508 gmp bits in 0.07s. */
+ if (N >= 1) {
+   S1(0);
+-  if ((M <= 0) && (N >= 2)) {
+-    S3(0);
+-    S10(0);
+-    S1(1);
+-    S5(0);
+-  }
+   if ((M >= 1) && (N == 1)) {
+     for (c4=0;c4<=M-1;c4++) {
+       S2(0,c4);
[email protected]@ -34,6 +28,12 @@
+     S10(0);
+     S1(1);
+     S5(0);
++  }
++  if ((M <= 0) && (N >= 2)) {
++    S3(0);
++    S10(0);
++    S1(1);
++    S5(0);
+   }
+   for (c2=2;c2<=min(M,N-1);c2++) {
+     for (c4=c2-1;c4<=N-1;c4++) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/patches/009-configure.patch	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,53 @@
+# -O3 makes GCC do loopy things. So, don't use -O3, use -O2 instead.
+# Not for upstream.
+--- configure	2014-12-08 05:42:51.000000000 -0800
++++ configure	2016-01-20 08:22:03.089548131 -0800
[email protected]@ -11879,14 +11879,14 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5
+ $as_echo "$ax_check_compiler_flags" >&6; }
+ if test "x$ax_check_compiler_flags" = xyes; then
+-	CFLAGS="-O3 -qansialias -w $xlc_opt"
++	CFLAGS="-O2 -qansialias -w $xlc_opt"
+ else
+-	CFLAGS="-O3 -qansialias -w"
++	CFLAGS="-O2 -qansialias -w"
+                 echo "******************************************************"
+                 echo "*  You seem to have the IBM  C compiler.  It is      *"
+                 echo "*  recommended for best performance that you use:    *"
+                 echo "*                                                    *"
+-                echo "*    CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *"
++                echo "*    CFLAGS=-O2 -qarch=xxx -qtune=xxx -qansialias -w *"
+                 echo "*                      ^^^        ^^^                *"
+                 echo "*  where xxx is pwr2, pwr3, 604, or whatever kind of *"
+                 echo "*  CPU you have.  (Set the CFLAGS environment var.   *"
[email protected]@ -11896,7 +11896,7 @@
+ 
+          ;;
+ 
+-    intel) CFLAGS="-O3 -ansi_alias"
++    intel) CFLAGS="-O2 -ansi_alias"
+ 	if test "x$acx_maxopt_portable" = xno; then
+ 	  icc_archflag=unknown
+ 	  icc_flags=""
[email protected]@ -12069,7 +12069,7 @@
+ 
+     gnu)
+      # default optimization flags for gcc on all systems
+-     CFLAGS="-O3 -fomit-frame-pointer"
++     CFLAGS="-O2 -fno-omit-frame-pointer"
+ 
+      # -malign-double for x86 systems
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5
[email protected]@ -12590,10 +12590,10 @@
+ 	echo "********************************************************"
+         echo "* WARNING: Don't know the best CFLAGS for this system  *"
+         echo "* Use ./configure CFLAGS=... to specify your own flags *"
+-	echo "* (otherwise, a default of CFLAGS=-O3 will be used)    *"
++	echo "* (otherwise, a default of CFLAGS=-O2 will be used)    *"
+ 	echo "********************************************************"
+ 	echo ""
+-        CFLAGS="-O3"
++        CFLAGS="-O2"
+   fi
+ 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CFLAGS" >&5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cloog/test/results-cloog.master	Thu Jan 28 10:36:09 2016 -0800
@@ -0,0 +1,16 @@
+PASS: check_c.sh
+PASS: check_fortran.sh
+PASS: check_strided.sh
+PASS: check_openscop.sh
+PASS: check_special.sh
+============================================================================
+Testsuite summary for cloog 0.18.3
+============================================================================
+# TOTAL: 5
+# PASS:  5
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
--- a/components/gcc47/Makefile	Thu Jan 28 09:22:26 2016 -0800
+++ b/components/gcc47/Makefile	Thu Jan 28 10:36:09 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -52,6 +52,9 @@
 PKG_MACROS +=	GCC_V=$(word 1,$(VERSION_NUMBERS))$(word 2,$(VERSION_NUMBERS))
 PKG_MACROS +=	GCC_BASEDIR=usr/gcc/$(GCC_VERSION)
 
+# Make sure to pass -m32/64 any time the installed GCC is used
+CC += $(CC_BITS)
+CXX += $(CC_BITS)
 
 # This product bootstraps itself.  The gcc flags are not the same
 # as Studio flags. -O2 means different things for the two compilers
@@ -84,6 +87,8 @@
 CONFIGURE_OPTIONS +=	--with-gmp-include=/usr/include/gmp
 CONFIGURE_OPTIONS +=	--with-mpfr-include=/usr/include/mpfr
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_OPTIONS +=	--with-isl=no
+CONFIGURE_OPTIONS +=	--with-cloog=no
 
 CONFIGURE_ENV     += PYTHON="$(PYTHON)"
 
--- a/components/gcc48/Makefile	Thu Jan 28 09:22:26 2016 -0800
+++ b/components/gcc48/Makefile	Thu Jan 28 10:36:09 2016 -0800
@@ -95,6 +95,8 @@
 CONFIGURE_OPTIONS +=	--with-gmp-include=/usr/include/gmp
 CONFIGURE_OPTIONS +=	--with-mpfr-include=/usr/include/mpfr
 CONFIGURE_OPTIONS +=	--without-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_OPTIONS +=   --with-isl=no
+CONFIGURE_OPTIONS +=   --with-cloog=no
 
 CONFIGURE_ENV     += PYTHON="$(PYTHON)"
 
--- a/components/gcc49/Makefile	Thu Jan 28 09:22:26 2016 -0800
+++ b/components/gcc49/Makefile	Thu Jan 28 10:36:09 2016 -0800
@@ -229,7 +229,7 @@
 
 ifeq ($(ENABLE_CLOOG), 1)
   REQUIRED_PACKAGES += library/isl
-  REQUIRED_PACKAGES += developer/cloog
+  REQUIRED_PACKAGES += library/cloog
 endif
 
 REQUIRED_PACKAGES += library/gmp