changeset in /hg/icedtea6: New patch to fix CACAO build on GCC 4.4

[Andrew John Hughes]

2009/6/24  <doko at ubuntu.com>:
> changeset 629f7b7a918f in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=629f7b7a918f
> description:
>        New patch to fix CACAO build on GCC 4.4
>
>        2009-06-24  Andrew John Hughes  <ahughes at redhat.com>
>
>                * patches/cacao/no-strict-aliasing.patch:
>                New patch to fix CACAO build on GCC 4.4 (see PR129).
>                * Makefile.am: Add new patch.
>                * HACKING: Update.
>
> diffstat:
>
> 4 files changed, 34 insertions(+), 1 deletion(-)
> ChangeLog                              |    7 +++++++
> HACKING                                |    2 ++
> Makefile.am                            |    3 ++-
> patches/cacao/no-strict-aliasing.patch |   23 +++++++++++++++++++++++
>
> diffs (66 lines):
>
> diff -r 46341fc21171 -r 629f7b7a918f ChangeLog
> --- a/ChangeLog Tue Jun 23 16:31:22 2009 +0200
> +++ b/ChangeLog Wed Jun 24 10:26:38 2009 +0200
> @@ -1,3 +1,10 @@ 2009-06-23  Matthias Klose  <doko at ubuntu
> +2009-06-24  Andrew John Hughes  <ahughes at redhat.com>
> +
> +       * patches/cacao/no-strict-aliasing.patch:
> +       New patch to fix CACAO build on GCC 4.4 (see PR129).
> +       * Makefile.am: Add new patch.
> +       * HACKING: Update.
> +
>  2009-06-23  Matthias Klose  <doko at ubuntu.com>
>
>        * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Fix header location.
> diff -r 46341fc21171 -r 629f7b7a918f HACKING
> --- a/HACKING   Tue Jun 23 16:31:22 2009 +0200
> +++ b/HACKING   Wed Jun 24 10:26:38 2009 +0200
> @@ -98,6 +98,8 @@ The following patches are currently appl
>  * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
>  * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
>  * icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
> +* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
> +
>  * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
>  * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
>  * icedtea-signature-iterator.patch: Add zero-specific signature handling.
> diff -r 46341fc21171 -r 629f7b7a918f Makefile.am
> --- a/Makefile.am       Tue Jun 23 16:31:22 2009 +0200
> +++ b/Makefile.am       Wed Jun 24 10:26:38 2009 +0200
> @@ -614,7 +614,8 @@ if BUILD_CACAO
>  if BUILD_CACAO
>  ICEDTEA_PATCHES += \
>        patches/icedtea-cacao.patch \
> -       patches/icedtea-cacao-no-mmap-first-page.patch
> +       patches/icedtea-cacao-no-mmap-first-page.patch \
> +       patches/cacao/no-strict-aliasing.patch
>  endif
>  if WITH_CACAO
>  ICEDTEA_PATCHES += \
> diff -r 46341fc21171 -r 629f7b7a918f patches/cacao/no-strict-aliasing.patch
> --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/cacao/no-strict-aliasing.patch    Wed Jun 24 10:26:38 2009 +0200
> @@ -0,0 +1,23 @@
> +--- cacao/cacao/configure.ac~  2009-03-16 12:42:56.000000000 +0100
> ++++ cacao/cacao/configure.ac   2009-06-23 16:19:20.000000000 +0200
> +@@ -37,7 +37,7 @@
> +
> + dnl set optimization and debugging for all architectures and systems
> + if test x"$CFLAGS" = "x"; then
> +-    OPT_CFLAGS="-g -O2"
> ++    OPT_CFLAGS="-g -O2 -fno-strict-aliasing"
> + else
> +     OPT_CFLAGS=$CFLAGS
> + fi
> +diff -ur cacao-0.99.4.orig/configure cacao-0.99.4/configure
> +--- cacao/cacao/configure      2009-03-16 12:42:56.000000000 +0100
> ++++ cacao/cacao/configure      2009-06-23 16:19:21.000000000 +0200
> +@@ -2825,7 +2825,7 @@
> +
> +
> + if test x"$CFLAGS" = "x"; then
> +-    OPT_CFLAGS="-g -O2"
> ++    OPT_CFLAGS="-g -O2 -fno-strict-aliasing"
> + else
> +     OPT_CFLAGS=$CFLAGS
> + fi
>

Thanks for applying this on my behalf!

Only noticed when I came to update IcedTea6 today and I had collisions :(
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8