The unified diff between revisions [eda4385a..] and [47f69a9e..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "debian/changelog"
# from [9d0223932cf6d4f7b076ff42a3bb1ea0c29be418]
# to [b4f817356c493f5f7b48a731703def8d73fb07e8]
#
# patch "debian/patches/pr28322.dpatch"
# from [9f723c9533c730b166b80ef0538239e95a42d551]
# to [31d3796d1db4dfad83312ba9f5328f1ab1b77e9a]
#
# patch "debian/patches/svn-updates.dpatch"
# from [01bf33fe5d7b1744589ef1f8486338703938f778]
# to [10c18ada275f8ec5eac666e1ea900f0639c60d37]
#
============================================================
--- debian/changelog 9d0223932cf6d4f7b076ff42a3bb1ea0c29be418
+++ debian/changelog b4f817356c493f5f7b48a731703def8d73fb07e8
@@ -1,3 +1,11 @@
+gcc-4.2 (4.2.4-6) unstable; urgency=low
+
+ * Update to SVN 20090117 from the ubuntu/gcc-4_2-branch.
+ - Fix PR c++/38850, PR c++/36019.
+ * Update backport for PR28322 (Gunther Nikl).
+
+ -- Matthias Klose <doko@debian.org> Sat, 17 Jan 2009 17:35:44 +0100
+
gcc-4.2 (4.2.4-5) unstable; urgency=low
* Update to SVN 20090104 from the ubuntu/gcc-4_2-branch.
============================================================
--- debian/patches/pr28322.dpatch 9f723c9533c730b166b80ef0538239e95a42d551
+++ debian/patches/pr28322.dpatch 31d3796d1db4dfad83312ba9f5328f1ab1b77e9a
@@ -61,24 +61,8 @@ 2008-06-03 Peter Maydell <pmaydell@chi
is a warning and not an error.
-Index: gcc/toplev.c
-===================================================================
---- gcc/toplev.c (revision 134648)
-+++ gcc/toplev.c (working copy)
-@@ -2036,6 +2036,9 @@
- if (!exit_after_options)
- do_compile ();
-
-+ if (warningcount || errorcount)
-+ print_ignored_options ();
-+
- if (errorcount || sorrycount)
- return (FATAL_EXIT_CODE);
-
-Index: gcc/opts.c
-===================================================================
---- gcc/opts.c (revision 134648)
-+++ gcc/opts.c (working copy)
+--- gcc/opts.c.orig 2008-03-08 13:32:39.000000000 +0000
++++ gcc/opts.c 2009-01-17 16:48:14.000000000 +0000
@@ -97,6 +97,12 @@
static bool flag_value_profile_transformations_set;
static bool flag_peel_loops_set, flag_branch_probabilities_set;
@@ -92,20 +76,23 @@ Index: gcc/opts.c
/* Input file names. */
const char **in_fnames;
unsigned num_in_fnames;
-@@ -181,6 +187,33 @@
+@@ -181,6 +187,36 @@
free (bad_lang);
}
+/* Buffer the unknown option described by the string OPT. Currently,
+ we only complain about unknown -Wno-* options if they may have
-+ prevented a diagnostic. Otherwise, we just ignore them. */
++ prevented a diagnostic. Otherwise, we just ignore them.
++ Note that if we do complain, it is only as a warning, not an error;
++ passing the compiler an unrecognised -Wno-* option should never
++ change whether the compilation succeeds or fails. */
+
-+static void postpone_unknown_option_error(const char *opt)
++static void postpone_unknown_option_warning(const char *opt)
+{
+ VEC_safe_push (const_char_p, heap, ignored_options, opt);
+}
+
-+/* Produce an error for each option previously buffered. */
++/* Produce a warning for each option previously buffered. */
+
+void print_ignored_options (void)
+{
@@ -117,7 +104,7 @@ Index: gcc/opts.c
+ {
+ const char *opt;
+ opt = VEC_pop (const_char_p, ignored_options);
-+ error ("unrecognized command line option \"%s\"", opt);
++ warning (0, "unrecognized command line option \"%s\"", opt);
+ }
+
+ input_location = saved_loc;
@@ -126,31 +113,41 @@ Index: gcc/opts.c
/* Handle the switch beginning at ARGV for the language indicated by
LANG_MASK. Returns the number of switches consumed. */
static unsigned int
-@@ -210,6 +243,14 @@
+@@ -210,6 +246,14 @@
opt = dup;
value = 0;
opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET);
+ if (opt_index == cl_options_count && opt[1] == 'W')
+ {
-+ /* We don't generate errors for unknown -Wno-* options
++ /* We don't generate warnings for unknown -Wno-* options
+ unless we issue diagnostics. */
-+ postpone_unknown_option_error (argv[0]);
++ postpone_unknown_option_warning (argv[0]);
+ result = 1;
+ goto done;
+ }
}
if (opt_index == cl_options_count)
-Index: gcc/opts.h
-===================================================================
---- gcc/opts.h (revision 134648)
-+++ gcc/opts.h (working copy)
+--- gcc/opts.h.orig 2007-09-03 11:05:59.000000000 +0000
++++ gcc/opts.h 2009-01-17 16:47:22.000000000 +0000
@@ -91,4 +91,5 @@
extern int option_enabled (int opt_idx);
extern bool get_option_state (int, struct cl_option_state *);
+extern void print_ignored_options (void);
#endif
+--- gcc/toplev.c.orig 2009-01-17 16:46:12.000000000 +0000
++++ gcc/toplev.c 2009-01-17 16:47:22.000000000 +0000
+@@ -2034,6 +2034,9 @@
+ if (!exit_after_options)
+ do_compile ();
+
++ if (warningcount || errorcount)
++ print_ignored_options ();
++
+ if (errorcount || sorrycount)
+ return (FATAL_EXIT_CODE);
+
Index: gcc/testsuite/gcc.dg/pr28322-2.c
===================================================================
--- gcc/testsuite/gcc.dg/pr28322-2.c (revision 0)
============================================================
--- debian/patches/svn-updates.dpatch 01bf33fe5d7b1744589ef1f8486338703938f778
+++ debian/patches/svn-updates.dpatch 10c18ada275f8ec5eac666e1ea900f0639c60d37
@@ -1,12 +1,12 @@
#! /bin/sh -e
-# DP: updates from the 4.2 branch upto 20090104.
+# DP: updates from the 4.2 branch upto 20090117.
last_updated()
{
cat > ${dir}LAST_UPDATED <<EOF
-Sun Jan 4 13:38:31 CET 2009
-Sun Jan 4 12:38:31 UTC 2009 (revision 143049)
+Sat Jan 17 17:49:09 CET 2009
+Sat Jan 17 16:49:09 UTC 2009 (revision 143471)
EOF
}
@@ -39,8 +39,8 @@ Index: libdecnumber/Makefile.in
Index: libdecnumber/Makefile.in
===================================================================
---- libdecnumber/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libdecnumber/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libdecnumber/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libdecnumber/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -122,7 +122,7 @@
distclean: clean
-rm -f config.h stamp-h1 config.status config.cache config.log \
@@ -52,8 +52,8 @@ Index: libdecnumber/ChangeLog
@echo "This command is intended for maintainers to use"
Index: libdecnumber/ChangeLog
===================================================================
---- libdecnumber/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libdecnumber/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libdecnumber/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libdecnumber/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,11 @@
+2008-06-16 Ben Elliston <bje@au.ibm.com>
+
@@ -68,8 +68,8 @@ Index: gcc/regrename.c
* GCC 4.2.4 released.
Index: gcc/regrename.c
===================================================================
---- gcc/regrename.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/regrename.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/regrename.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/regrename.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1335,6 +1335,10 @@
enum machine_mode new_mode, unsigned int regno,
unsigned int copy_regno ATTRIBUTE_UNUSED)
@@ -83,8 +83,8 @@ Index: gcc/doc/install.texi2html
else if (mode_change_ok (orig_mode, new_mode, regno))
Index: gcc/doc/install.texi2html
===================================================================
---- gcc/doc/install.texi2html (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/doc/install.texi2html (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/doc/install.texi2html (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/doc/install.texi2html (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -32,7 +32,7 @@
echo "@clear DEVELOPMENT"
fi
@@ -106,8 +106,8 @@ Index: gcc/java/class.c
+rm $DESTDIR/gcc-vers.texi
Index: gcc/java/class.c
===================================================================
---- gcc/java/class.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/java/class.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/java/class.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/java/class.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,6 +1,6 @@
/* Functions related to building classes and their related objects.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -133,8 +133,8 @@ Index: gcc/java/ChangeLog
return build_static_class_ref (type);
Index: gcc/java/ChangeLog
===================================================================
---- gcc/java/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/java/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/java/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/java/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,13 @@
+2008-06-14 Tom Tromey <tromey@redhat.com>
+
@@ -151,8 +151,8 @@ Index: gcc/cgraph.c
* gcj.texi: Include gpl_v3.texi instead of gpl.texi
Index: gcc/cgraph.c
===================================================================
---- gcc/cgraph.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cgraph.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cgraph.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cgraph.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -593,6 +593,14 @@
&& (TREE_ASM_WRITTEN (n->decl) || DECL_EXTERNAL (n->decl))))
kill_body = true;
@@ -170,15 +170,15 @@ Index: gcc/DATESTAMP
{
Index: gcc/DATESTAMP
===================================================================
---- gcc/DATESTAMP (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/DATESTAMP (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/DATESTAMP (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/DATESTAMP (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1 +1 @@
-20080519
-+20090104
++20090117
Index: gcc/rtlanal.c
===================================================================
---- gcc/rtlanal.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/rtlanal.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/rtlanal.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/rtlanal.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -3400,8 +3400,9 @@
enum rtx_code code;
unsigned int mode_width = GET_MODE_BITSIZE (mode);
@@ -203,8 +203,8 @@ Index: gcc/configure
/* For a smaller object, just ignore the high bits. */
Index: gcc/configure
===================================================================
---- gcc/configure (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/configure (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/configure (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/configure (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -14045,9 +14045,16 @@
# arbitrary sections are supported and try the test.
as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
@@ -227,8 +227,8 @@ Index: gcc/fold-const.c
else gcc_cv_as_leb128=yes
Index: gcc/fold-const.c
===================================================================
---- gcc/fold-const.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/fold-const.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/fold-const.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/fold-const.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -816,7 +816,7 @@
if (hden < 0)
neg_double (lden, hden, &labs_den, &habs_den);
@@ -249,8 +249,8 @@ Index: gcc/cgraphunit.c
/* quo = quo - 1; */
Index: gcc/cgraphunit.c
===================================================================
---- gcc/cgraphunit.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cgraphunit.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cgraphunit.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cgraphunit.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1609,7 +1609,10 @@
for (node = cgraph_nodes; node; node = node->next)
if (node->analyzed
@@ -265,9 +265,14 @@ Index: gcc/ChangeLog
dump_cgraph_node (stderr, node);
Index: gcc/ChangeLog
===================================================================
---- gcc/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -1,3 +1,178 @@
+--- gcc/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -1,3 +1,183 @@
++2009-01-07 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
++
++ * pa.c (output_call): Relocate non-jump insns in the delay slot of long
++ absolute calls when generating PA 2.0 code.
++
+2008-12-25 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ PR bootstrap/37295
@@ -446,7 +451,7 @@ Index: gcc/ChangeLog
2008-05-19 Release Manager
* GCC 4.2.4 released.
-@@ -2610,7 +2785,7 @@
+@@ -2610,7 +2790,7 @@
* config/rs6000/rs6000.c (rs6000_function_value): Look at bit size
instead of precision.
@@ -458,7 +463,7 @@ Index: gcc/testsuite/gcc.c-torture/compi
Index: gcc/testsuite/gcc.c-torture/compile/pr35432.c
===================================================================
--- gcc/testsuite/gcc.c-torture/compile/pr35432.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.c-torture/compile/pr35432.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.c-torture/compile/pr35432.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,11 @@
+/* PR middle-end/35432 */
+
@@ -474,7 +479,7 @@ Index: gcc/testsuite/gcc.target/i386/pr3
Index: gcc/testsuite/gcc.target/i386/pr36438.c
===================================================================
--- gcc/testsuite/gcc.target/i386/pr36438.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.target/i386/pr36438.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.target/i386/pr36438.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mmmx" } */
@@ -499,7 +504,7 @@ Index: gcc/testsuite/gcc.target/i386/pr3
Index: gcc/testsuite/gcc.target/i386/pr37101.c
===================================================================
--- gcc/testsuite/gcc.target/i386/pr37101.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.target/i386/pr37101.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.target/i386/pr37101.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,64 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -msse2 -ftree-vectorize -march=nocona" } */
@@ -568,7 +573,7 @@ Index: gcc/testsuite/gcc.target/i386/mmx
Index: gcc/testsuite/gcc.target/i386/mmx-8.c
===================================================================
--- gcc/testsuite/gcc.target/i386/mmx-8.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.target/i386/mmx-8.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.target/i386/mmx-8.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,150 @@
+/* PR middle-end/37809 */
+
@@ -723,7 +728,7 @@ Index: gcc/testsuite/gnat.dg/conv_decima
Index: gcc/testsuite/gnat.dg/conv_decimal.adb
===================================================================
--- gcc/testsuite/gnat.dg/conv_decimal.adb (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gnat.dg/conv_decimal.adb (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gnat.dg/conv_decimal.adb (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,34 @@
+-- PR middle-end/36575
+-- reporter: Laurent Guerby <laurent@guerby.net>
@@ -762,7 +767,7 @@ Index: gcc/testsuite/gcc.dg/nested-func-
Index: gcc/testsuite/gcc.dg/nested-func-6.c
===================================================================
--- gcc/testsuite/gcc.dg/nested-func-6.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/nested-func-6.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/nested-func-6.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O -Winline" } */
@@ -781,7 +786,7 @@ Index: gcc/testsuite/gcc.dg/union-5.c
Index: gcc/testsuite/gcc.dg/union-5.c
===================================================================
--- gcc/testsuite/gcc.dg/union-5.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/union-5.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/union-5.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,46 @@
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O -fgcse" } */
@@ -832,7 +837,7 @@ Index: gcc/testsuite/gcc.dg/torture/pr37
Index: gcc/testsuite/gcc.dg/torture/pr37731-1.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr37731-1.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/torture/pr37731-1.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/torture/pr37731-1.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,17 @@
+/* { dg-do run } */
+
@@ -854,7 +859,7 @@ Index: gcc/testsuite/gcc.dg/torture/pr37
Index: gcc/testsuite/gcc.dg/torture/pr37731-2.c
===================================================================
--- gcc/testsuite/gcc.dg/torture/pr37731-2.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/torture/pr37731-2.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/torture/pr37731-2.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,17 @@
+/* { dg-do run } */
+
@@ -876,7 +881,7 @@ Index: gcc/testsuite/gcc.dg/pr37544.c
Index: gcc/testsuite/gcc.dg/pr37544.c
===================================================================
--- gcc/testsuite/gcc.dg/pr37544.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/pr37544.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/pr37544.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,38 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
@@ -919,7 +924,7 @@ Index: gcc/testsuite/gcc.dg/pr36194.c
Index: gcc/testsuite/gcc.dg/pr36194.c
===================================================================
--- gcc/testsuite/gcc.dg/pr36194.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/gcc.dg/pr36194.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/gcc.dg/pr36194.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,25 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
@@ -948,9 +953,24 @@ Index: gcc/testsuite/ChangeLog
+}
Index: gcc/testsuite/ChangeLog
===================================================================
---- gcc/testsuite/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/testsuite/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -1,3 +1,105 @@
+--- gcc/testsuite/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/testsuite/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -1,3 +1,120 @@
++2009-01-15 Jason Merrill <jason@redhat.com>
++
++ PR c++/38850
++ * g++.dg/template/koenig6.C: New test.
++
++2009-01-12 Dodji Seketeli <dodji@redhat.com>
++
++ PR c++/36019
++ * g++.dg/lookup/hidden-class12.C: New test.
++ * g++.dg/lookup/hidden-class13.C: New test.
++ * g++.dg/lookup/hidden-class14.C: New test.
++ * g++.dg/lookup/hidden-class15.C: New test.
++ * g++.dg/lookup/hidden-class16.C: New test.
++ * gcc/testsuite/g++.old-deja/g++.benjamin/tem03.C: Adjust testcase.
++
+2008-12-05 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gcc.dg/union-5.c: Run only on x86 and x86-64.
@@ -1056,7 +1076,7 @@ Index: gcc/testsuite/ChangeLog
2008-05-19 Release Manager
* GCC 4.2.4 released.
-@@ -293,7 +395,7 @@
+@@ -293,7 +410,7 @@
PR testsuite/30459
g++.dg/eh/ia64-2.C: Require weak support.
@@ -1065,7 +1085,7 @@ Index: gcc/testsuite/ChangeLog
Backport:
2007-10-31 Paolo Carlini <pcarlini@suse.de>
-@@ -1385,7 +1487,7 @@
+@@ -1385,7 +1502,7 @@
PR libfortran/31001
* gfortran.dg/zero_sized_3.f90: New test.
@@ -1074,10 +1094,34 @@ Index: gcc/testsuite/ChangeLog
PR c++/30852
* g++.dg/ext/offsetof1.C: Add cases with volatile.
+Index: gcc/testsuite/g++.old-deja/g++.benjamin/tem03.C
+===================================================================
+--- gcc/testsuite/g++.old-deja/g++.benjamin/tem03.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/testsuite/g++.old-deja/g++.benjamin/tem03.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -83,7 +83,7 @@
+ template <class T10, int i> struct Xfour {// { dg-error "" } .*
+ int T10; // { dg-error "" } .*
+ void f(){
+- char T10;
++ char T10; // { dg-error "declaration of 'char T10'" }
+ }
+ };
+
+@@ -126,8 +126,8 @@
+ template <class T161>
+ friend bool foo(T161 u)
+ {
+- Xseven<T161, 5, int> obj; // { dg-error "" } .*
+- return (obj.inst == u.inst); // { dg-error "" } .*
++ Xseven<T161, 5, int> obj;
++ return (obj.inst == u.inst);
+ }
+
+ };
Index: gcc/testsuite/g++.old-deja/g++.mike/enum1.C
===================================================================
---- gcc/testsuite/g++.old-deja/g++.mike/enum1.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/testsuite/g++.old-deja/g++.mike/enum1.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/testsuite/g++.old-deja/g++.mike/enum1.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/testsuite/g++.old-deja/g++.mike/enum1.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -8,4 +8,4 @@
void setBTK();
};
@@ -1087,7 +1131,7 @@ Index: gcc/testsuite/g++.dg/conversion/b
Index: gcc/testsuite/g++.dg/conversion/bitfield10.C
===================================================================
--- gcc/testsuite/g++.dg/conversion/bitfield10.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/conversion/bitfield10.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/conversion/bitfield10.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,24 @@
+// PR c++/38007
+// We need to use the conversion function to the declared type of a bitfield,
@@ -1116,7 +1160,7 @@ Index: gcc/testsuite/g++.dg/conversion/b
Index: gcc/testsuite/g++.dg/conversion/bitfield11.C
===================================================================
--- gcc/testsuite/g++.dg/conversion/bitfield11.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/conversion/bitfield11.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/conversion/bitfield11.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,8 @@
+// Make sure that digest_init converts to the declared type of the
+// bitfield, not just the lowered type.
@@ -1129,7 +1173,7 @@ Index: gcc/testsuite/g++.dg/debug/dwarf2
Index: gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp
===================================================================
--- gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,43 @@
+# Copyright (C) 2007, 2007 Free Software Foundation, Inc.
+
@@ -1177,7 +1221,7 @@ Index: gcc/testsuite/g++.dg/debug/dwarf2
Index: gcc/testsuite/g++.dg/debug/dwarf2/local-var-in-contructor.C
===================================================================
--- gcc/testsuite/g++.dg/debug/dwarf2/local-var-in-contructor.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/debug/dwarf2/local-var-in-contructor.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/debug/dwarf2/local-var-in-contructor.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,30 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin PR27574
@@ -1212,7 +1256,7 @@ Index: gcc/testsuite/g++.dg/opt/reload3.
Index: gcc/testsuite/g++.dg/opt/reload3.C
===================================================================
--- gcc/testsuite/g++.dg/opt/reload3.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/opt/reload3.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/opt/reload3.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,39 @@
+// PR target/38287
+// { dg-do run }
@@ -1253,10 +1297,164 @@ Index: gcc/testsuite/g++.dg/opt/reload3.
+ abort ();
+ return 0;
+}
+Index: gcc/testsuite/g++.dg/lookup/hidden-class12.C
+===================================================================
+--- gcc/testsuite/g++.dg/lookup/hidden-class12.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/lookup/hidden-class12.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,24 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/36019
++// { dg-do compile }
++
++struct F {
++ static const int x = 0;
++};
++
++struct A {
++ template <typename A>
++ static int f ()
++ {
++ return A::x;
++ }
++};
++
++
++int
++main ()
++{
++ int i = A::f<F> ();
++ return i;
++}
++
+Index: gcc/testsuite/g++.dg/lookup/hidden-class16.C
+===================================================================
+--- gcc/testsuite/g++.dg/lookup/hidden-class16.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/lookup/hidden-class16.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,27 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/36019
++// { dg-do compile }
++
++struct F {
++ static const int y = 0;
++};
++
++struct A {
++ static const int x = 0;
++};
++
++struct B : public A {
++ template <typename A>
++ static int f ()
++ {
++ return A::x; // { dg-error "'x' is not a member of 'F'" }
++ }
++};
++
++int
++main ()
++{
++ int j = B::f<F> ();
++ return 0;
++}
++
+Index: gcc/testsuite/g++.dg/lookup/hidden-class13.C
+===================================================================
+--- gcc/testsuite/g++.dg/lookup/hidden-class13.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/lookup/hidden-class13.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,25 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/36019
++// { dg-do compile }
++
++struct F {
++ static const int x = 0;
++};
++
++struct B {
++ template <typename B>
++ struct C
++ {
++ static int f ()
++ {
++ return B::x;
++ }
++ };
++};
++
++int
++main ()
++{
++ int j = B::C<F>::f ();
++ return 0;
++}
+Index: gcc/testsuite/g++.dg/lookup/hidden-class14.C
+===================================================================
+--- gcc/testsuite/g++.dg/lookup/hidden-class14.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/lookup/hidden-class14.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,23 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/36019
++// { dg-do compile }
++
++struct F {
++ static const int x = 0;
++ typedef int A;
++};
++
++struct A {
++ template <typename A>
++ struct G : public F
++ {
++ static const A i = 0;
++ };
++};
++
++int
++main ()
++{
++ return A::G<F>::i ;
++}
++
+Index: gcc/testsuite/g++.dg/lookup/hidden-class15.C
+===================================================================
+--- gcc/testsuite/g++.dg/lookup/hidden-class15.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/lookup/hidden-class15.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,30 @@
++// Contributed by Dodji Seketeli <dodji@redhat.com>
++// Origin PR c++/36019
++// { dg-do compile }
++
++struct F {
++ static const int y = 0;
++};
++
++struct A {
++ static const int x = 0;
++};
++
++struct B : public A {
++ template <typename A>
++ struct C
++ {
++ static int f ()
++ {
++ return A::x; // { dg-error "'x' is not a member of 'F'" }
++ }
++ };
++};
++
++int
++main ()
++{
++ int j = B::C<F>::f ();
++ return 0;
++}
++
Index: gcc/testsuite/g++.dg/template/crash71.C
===================================================================
--- gcc/testsuite/g++.dg/template/crash71.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/template/crash71.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/template/crash71.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,16 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin: PR c++/37142
@@ -1274,10 +1472,44 @@ Index: gcc/testsuite/g++.dg/template/cra
+}
+
+
+Index: gcc/testsuite/g++.dg/template/koenig6.C
+===================================================================
+--- gcc/testsuite/g++.dg/template/koenig6.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
++++ gcc/testsuite/g++.dg/template/koenig6.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -0,0 +1,29 @@
++// PR c++/38850
++
++template <typename VType>
++class Vector2 {
++ private:
++ VType c_[2];
++ public:
++ typedef Vector2<VType> Self;
++
++ Vector2(const VType x, const VType y) {
++ c_[0] = x;
++ c_[1] = y;
++ }
++
++ friend inline Self Max(const Self &v1, const Self &v2) {
++ return Self(v1.c_[0], v1.c_[1]);
++ }
++};
++
++template <class T>
++Vector2<float> foo(T x) {
++ Vector2<float> y(0,0);
++ return Max(y, y);
++}
++
++int main() {
++ foo(3);
++ return 0;
++}
Index: gcc/testsuite/g++.dg/template/lookup8.C
===================================================================
--- gcc/testsuite/g++.dg/template/lookup8.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 0)
-+++ gcc/testsuite/g++.dg/template/lookup8.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
++++ gcc/testsuite/g++.dg/template/lookup8.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -0,0 +1,19 @@
+// PR c++/38030
+// The call to f should be resolved at template definition time.
@@ -1300,8 +1532,8 @@ Index: gcc/testsuite/g++.dg/expr/bitfiel
+}
Index: gcc/testsuite/g++.dg/expr/bitfield9.C
===================================================================
---- gcc/testsuite/g++.dg/expr/bitfield9.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/testsuite/g++.dg/expr/bitfield9.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/testsuite/g++.dg/expr/bitfield9.C (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/testsuite/g++.dg/expr/bitfield9.C (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,5 +1,6 @@
// PR c++/32346
// { dg-do run }
@@ -1311,8 +1543,8 @@ Index: gcc/cp/typeck.c
Index: gcc/cp/typeck.c
===================================================================
---- gcc/cp/typeck.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cp/typeck.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cp/typeck.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/typeck.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -5549,7 +5549,6 @@
tree newrhs = rhs;
tree lhstype = TREE_TYPE (lhs);
@@ -1415,11 +1647,41 @@ Index: gcc/cp/typeck.c
}
tree
+Index: gcc/cp/cp-tree.h
+===================================================================
+--- gcc/cp/cp-tree.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/cp-tree.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -4163,6 +4163,8 @@
+ extern tree fold_non_dependent_expr (tree);
+ extern bool explicit_class_specialization_p (tree);
+ extern tree outermost_tinst_level (void);
++extern tree get_template_info (tree t);
++extern bool parameter_of_template_p (tree, tree);
+
+ /* in repo.c */
+ extern void init_repo (void);
Index: gcc/cp/ChangeLog
===================================================================
---- gcc/cp/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cp/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -1,3 +1,26 @@
+--- gcc/cp/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -1,3 +1,43 @@
++2009-01-15 Jason Merrill <jason@redhat.com>
++
++ PR c++/38850
++ * pt.c (tsubst_copy_and_build): Tell finish_call_expr to
++ accept hidden friends.
++
++2009-01-12 Dodji Seketeli <dodji@redhat.com>
++
++ PR c++/36019
++ * pt.c (parameter_of_template_p): New function.
++ * pt.c (get_template_info): Ditto.
++ * cp-tree.h: Declare those.
++ * name-lookup.c (binding_to_template_parms_of_scope_p): New
++ function.
++ (outer_binding): Take template parameters in account when looking for
++ a name binding.
++
+2008-11-19 Dodji Seketeli <dodji@redhat.com>
+
+ PR c++/37142
@@ -1446,7 +1708,7 @@ Index: gcc/cp/ChangeLog
2008-05-19 Release Manager
* GCC 4.2.4 released.
-@@ -82,7 +105,7 @@
+@@ -82,7 +122,7 @@
PR c++/33959
* pt.c (tsubst_aggr_type): Make sure our context is complete.
@@ -1455,7 +1717,7 @@ Index: gcc/cp/ChangeLog
Backport:
2007-10-31 Paolo Carlini <pcarlini@suse.de>
-@@ -545,7 +568,7 @@
+@@ -545,7 +585,7 @@
PR C++/30168
* optimize.c (update_cloned_parm): Copy DECL_COMPLEX_GIMPLE_REG_P also.
@@ -1466,8 +1728,8 @@ Index: gcc/cp/typeck2.c
* semantics.c (finish_offsetof): Handle COMPOUND_EXPR.
Index: gcc/cp/typeck2.c
===================================================================
---- gcc/cp/typeck2.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cp/typeck2.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cp/typeck2.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/typeck2.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -888,6 +888,7 @@
for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
{
@@ -1509,9 +1771,35 @@ Index: gcc/cp/pt.c
}
Index: gcc/cp/pt.c
===================================================================
---- gcc/cp/pt.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cp/pt.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -3962,7 +3962,7 @@
+--- gcc/cp/pt.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/pt.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -251,6 +251,25 @@
+ return error_mark_node;
+ }
+
++/* Return the template info node corresponding to T, whatever T is. */
++
++tree
++get_template_info (tree t)
++{
++ tree tinfo = NULL_TREE;
++
++ if (DECL_P (t) && DECL_LANG_SPECIFIC (t))
++ tinfo = DECL_TEMPLATE_INFO (t);
++
++ if (!tinfo && TREE_CODE (t) == TYPE_DECL)
++ t = TREE_TYPE (t);
++
++ if (TAGGED_TYPE_P (t))
++ tinfo = TYPE_TEMPLATE_INFO (t);
++
++ return tinfo;
++}
++
+ /* Returns the template nesting level of the indicated class TYPE.
+
+ For example, in:
+@@ -3962,7 +3981,7 @@
D<int, C> d;
i.e. the parameter list of TT depends on earlier parameters. */
@@ -1520,10 +1808,55 @@ Index: gcc/cp/pt.c
&& !same_type_p
(tsubst (TREE_TYPE (parm), outer_args, complain, in_decl),
TREE_TYPE (arg)))
+@@ -5327,6 +5346,30 @@
+ return tree_last (current_tinst_level);
+ }
+
++/* Returns TRUE if PARM is a parameter of the template TEMPL. */
++
++bool
++parameter_of_template_p (tree parm, tree templ)
++{
++ tree parms;
++ int i;
++
++ if (!parm || !templ)
++ return false;
++
++ gcc_assert (DECL_TEMPLATE_PARM_P (parm));
++ gcc_assert (TREE_CODE (templ) == TEMPLATE_DECL);
++
++ parms = DECL_TEMPLATE_PARMS (templ);
++ parms = INNERMOST_TEMPLATE_PARMS (parms);
++
++ for (i = 0; i < TREE_VEC_LENGTH (parms); ++i)
++ if (parm == TREE_VALUE (TREE_VEC_ELT (parms, i)))
++ return true;
++
++ return false;
++}
++
+ /* DECL is a friend FUNCTION_DECL or TEMPLATE_DECL. ARGS is the
+ vector of template arguments, as for tsubst.
+
+@@ -9274,9 +9317,12 @@
+ qualified_p ? LOOKUP_NONVIRTUAL : LOOKUP_NORMAL,
+ /*fn_p=*/NULL));
+ }
++ /* Pass true for koenig_p so that build_new_function_call will
++ allow hidden friends found by arg-dependent lookup at template
++ parsing time. */
+ return finish_call_expr (function, call_args,
+ /*disallow_virtual=*/qualified_p,
+- koenig_p);
++ /*koenig_p*/true);
+ }
+
+ case COND_EXPR:
Index: gcc/cp/semantics.c
===================================================================
---- gcc/cp/semantics.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cp/semantics.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cp/semantics.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/semantics.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1886,7 +1886,9 @@
{
result = build3 (CALL_EXPR, TREE_TYPE (result), orig_fn,
@@ -1535,10 +1868,63 @@ Index: gcc/cp/semantics.c
}
return result;
}
+Index: gcc/cp/name-lookup.c
+===================================================================
+--- gcc/cp/name-lookup.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cp/name-lookup.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -3850,9 +3850,33 @@
+ POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, result->value != error_mark_node);
+ }
+
++/* Subroutine of outer_binding.
++ Returns TRUE if BINDING is a binding to a template parameter of SCOPE,
++ FALSE otherwise. */
++static bool
++binding_to_template_parms_of_scope_p (cxx_binding *binding,
++ cxx_scope *scope)
++{
++ tree binding_value;
++
++ if (!binding || !scope)
++ return false;
++
++ binding_value = binding->value ? binding->value : binding->type;
++
++ return (scope
++ && scope->this_entity
++ && get_template_info (scope->this_entity)
++ && parameter_of_template_p (binding_value,
++ TI_TEMPLATE (get_template_info \
++ (scope->this_entity))));
++}
++
+ /* Return the innermost non-namespace binding for NAME from a scope
+- containing BINDING, or, if BINDING is NULL, the current scope. If
+- CLASS_P is false, then class bindings are ignored. */
++ containing BINDING, or, if BINDING is NULL, the current scope.
++ Please note that for a given template, the template parameters are
++ considered to be in the scope containing the current scope.
++ If CLASS_P is false, then class bindings are ignored. */
+
+ cxx_binding *
+ outer_binding (tree name,
+@@ -3900,6 +3924,12 @@
+ return class_binding;
+ }
+ }
++ /* If SCOPE is a template and if NAME binds to one of its template parameters
++ return the binding, otherwise we might miss it. */
++ if (outer_scope && outer_scope->kind == sk_template_parms
++ && binding_to_template_parms_of_scope_p (outer, scope))
++ return outer;
++
+ scope = scope->level_chain;
+ }
+
Index: gcc/cse.c
===================================================================
---- gcc/cse.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/cse.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/cse.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/cse.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1455,17 +1455,6 @@
struct table_elt *p
= lookup (x, SAFE_HASH (x, VOIDmode), GET_MODE (x));
@@ -1622,8 +2008,8 @@ Index: gcc/configure.ac
|| INTVAL (inner_const) < 0))
Index: gcc/configure.ac
===================================================================
---- gcc/configure.ac (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/configure.ac (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/configure.ac (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/configure.ac (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -2178,9 +2178,16 @@
as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
if echo "$as_ver" | grep GNU > /dev/null; then
@@ -1646,8 +2032,8 @@ Index: gcc/gimplify.c
then :
Index: gcc/gimplify.c
===================================================================
---- gcc/gimplify.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/gimplify.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/gimplify.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/gimplify.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -3540,7 +3540,7 @@
side as statements and throw away the assignment. Do this after
gimplify_modify_expr_rhs so we handle TARGET_EXPRs of addressable
@@ -1659,8 +2045,8 @@ Index: gcc/expmed.c
gimplify_stmt (to_p);
Index: gcc/expmed.c
===================================================================
---- gcc/expmed.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/expmed.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/expmed.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/expmed.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -3163,7 +3163,8 @@
{
/* If we are multiplying in DImode, it may still be a win
@@ -1673,8 +2059,8 @@ Index: gcc/tree-nested.c
&& EXACT_POWER_OF_2_OR_ZERO_P (CONST_DOUBLE_HIGH (op1)))
Index: gcc/tree-nested.c
===================================================================
---- gcc/tree-nested.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/tree-nested.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/tree-nested.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/tree-nested.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -749,7 +749,7 @@
for (cgn = cgn->nested; cgn ; cgn = cgn->next_nested)
{
@@ -1686,8 +2072,8 @@ Index: gcc/combine.c
if (check_for_nested_with_variably_modified (cgn->decl, orig_fndecl))
Index: gcc/combine.c
===================================================================
---- gcc/combine.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/combine.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/combine.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/combine.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -430,7 +430,7 @@
static enum rtx_code simplify_comparison (enum rtx_code, rtx *, rtx *);
static void update_table_tick (rtx);
@@ -1837,8 +2223,8 @@ Index: gcc/c-common.c
}
Index: gcc/c-common.c
===================================================================
---- gcc/c-common.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/c-common.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/c-common.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/c-common.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1843,7 +1843,7 @@
#define TYPE_OK(node) \
@@ -1862,8 +2248,8 @@ Index: gcc/config.gcc
/* Build a bit-field integer type for the given WIDTH and UNSIGNEDP. */
Index: gcc/config.gcc
===================================================================
---- gcc/config.gcc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config.gcc (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config.gcc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config.gcc (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,6 +1,6 @@
# GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -1887,8 +2273,8 @@ Index: gcc/gthr-posix.h
# like -m32 for x86_64-*-*.
Index: gcc/gthr-posix.h
===================================================================
---- gcc/gthr-posix.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/gthr-posix.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/gthr-posix.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/gthr-posix.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -152,9 +152,12 @@
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
@@ -1924,8 +2310,8 @@ Index: gcc/config/sparc/sparc.md
Index: gcc/config/sparc/sparc.md
===================================================================
---- gcc/config/sparc/sparc.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/sparc/sparc.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/sparc/sparc.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/sparc/sparc.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -5070,14 +5070,11 @@
[(set_attr "type" "multi")
(set_attr "length" "2")])
@@ -2101,8 +2487,8 @@ Index: gcc/config/sparc/sparc.c
(set (attr "length")
Index: gcc/config/sparc/sparc.c
===================================================================
---- gcc/config/sparc/sparc.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/sparc/sparc.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/sparc/sparc.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/sparc/sparc.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -546,7 +546,7 @@
#undef TARGET_HANDLE_OPTION
#define TARGET_HANDLE_OPTION sparc_handle_option
@@ -2161,8 +2547,8 @@ Index: gcc/config/i386/sse.md
mclass = MODE_FLOAT;
Index: gcc/config/i386/sse.md
===================================================================
---- gcc/config/i386/sse.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/i386/sse.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/i386/sse.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/i386/sse.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -3576,20 +3576,19 @@
(set_attr "mode" "TI,V4SF,V2SF")])
@@ -2192,8 +2578,8 @@ Index: gcc/config/sh/t-sh
[(match_operand:V2DI 0 "register_operand" "")
Index: gcc/config/sh/t-sh
===================================================================
---- gcc/config/sh/t-sh (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/sh/t-sh (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/sh/t-sh (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/sh/t-sh (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -99,7 +99,7 @@
$(T)udivsi3_i4i-Os-4-200.o: $(srcdir)/config/sh/lib1funcs-Os-4-200.asm $(GCC_PASSES)
$(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $@ -DL_udivsi3_i4i -x assembler-with-cpp $<
@@ -2205,8 +2591,8 @@ Index: gcc/config/sh/sh.c
$(AR_CREATE_FOR_TARGET) $@ $(OBJS_Os_4_200)
Index: gcc/config/sh/sh.c
===================================================================
---- gcc/config/sh/sh.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/sh/sh.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/sh/sh.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/sh/sh.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -3477,6 +3477,10 @@
if (optimize)
@@ -2220,8 +2606,8 @@ Index: gcc/config/rs6000/rs6000.md
if (n_addr > n_target || n_addr + 1022 < n_target)
Index: gcc/config/rs6000/rs6000.md
===================================================================
---- gcc/config/rs6000/rs6000.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/rs6000/rs6000.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/rs6000/rs6000.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/rs6000/rs6000.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -10379,25 +10379,6 @@
operands[0] = XEXP (operands[0], 0);
@@ -2443,10 +2829,25 @@ Index: gcc/config/rs6000/rs6000.md
}
else
return \"b %z1\";
+Index: gcc/config/pa/pa.c
+===================================================================
+--- gcc/config/pa/pa.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/pa/pa.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -7462,7 +7462,9 @@
+ if (seq_length != 0
+ && GET_CODE (NEXT_INSN (insn)) != JUMP_INSN
+ && !sibcall
+- && (!TARGET_PA_20 || indirect_call))
++ && (!TARGET_PA_20
++ || indirect_call
++ || ((TARGET_LONG_ABS_CALL || local_call) && !flag_pic)))
+ {
+ /* A non-jump insn in the delay slot. By definition we can
+ emit this insn before the call (and in fact before argument
Index: gcc/config/mips/mips.md
===================================================================
---- gcc/config/mips/mips.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/mips/mips.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/mips/mips.md (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/mips/mips.md (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -4037,12 +4037,11 @@
}
[(set_attr "length" "8")])
@@ -2463,8 +2864,8 @@ Index: gcc/config/mips/mips.c
[(set_attr "type" "unknown")
Index: gcc/config/mips/mips.c
===================================================================
---- gcc/config/mips/mips.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/config/mips/mips.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/config/mips/mips.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/config/mips/mips.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -6709,13 +6709,16 @@
offset = mips_unspec_address (addr, SYMBOL_GOTOFF_LOADGP);
incoming_address = gen_rtx_REG (Pmode, PIC_FUNCTION_ADDR_REGNUM);
@@ -2487,8 +2888,8 @@ Index: gcc/gthr-posix95.h
/* Set up the stack and frame (if desired) for the function. */
Index: gcc/gthr-posix95.h
===================================================================
---- gcc/gthr-posix95.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ gcc/gthr-posix95.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- gcc/gthr-posix95.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ gcc/gthr-posix95.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -115,9 +115,12 @@
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
@@ -2522,10 +2923,39 @@ Index: gcc/gthr-posix95.h
#else /* not SUPPORTS_WEAK */
+Index: libffi/ChangeLog
+===================================================================
+--- libffi/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libffi/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -1,3 +1,24 @@
++2008-09-10 Andreas Tobler <a.tobler@schweiz.org>
++
++ * src/powerpc/ffitarget.h (ffi_abi): Add FFI_LINUX and
++ FFI_LINUX_SOFT_FLOAT to the POWERPC_FREEBSD enum.
++ Add note about flag bits used for FFI_SYSV_TYPE_SMALL_STRUCT.
++ Adjust copyright notice.
++ * src/powerpc/ffi.c: Add two new flags to indicate if we have one
++ register or two register to use for FFI_SYSV structs.
++ (ffi_prep_cif_machdep): Pass the right register flag introduced above.
++ (ffi_closure_helper_SYSV): Fix the return type for
++ FFI_SYSV_TYPE_SMALL_STRUCT. Comment.
++ Adjust copyright notice.
++
++2008-08-27 Release Manager
++
++ * GCC 4.3.2 released.
++
++2008-06-06 Release Manager
++
++ * GCC 4.3.1 released.
++
+ 2008-03-05 Release Manager
+
+ * GCC 4.3.0 released.
Index: libffi/src/powerpc/ffitarget.h
===================================================================
---- libffi/src/powerpc/ffitarget.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libffi/src/powerpc/ffitarget.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libffi/src/powerpc/ffitarget.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libffi/src/powerpc/ffitarget.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,6 +1,6 @@
/* -----------------------------------------------------------------*-C-*-
ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc.
@@ -2556,8 +2986,8 @@ Index: libffi/src/powerpc/ffi.c
#if defined(POWERPC64) || defined(POWERPC_AIX)
Index: libffi/src/powerpc/ffi.c
===================================================================
---- libffi/src/powerpc/ffi.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libffi/src/powerpc/ffi.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libffi/src/powerpc/ffi.c (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libffi/src/powerpc/ffi.c (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,6 +1,6 @@
/* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1998 Geoffrey Keating
@@ -2612,39 +3042,10 @@ Index: libffi/src/powerpc/ffi.c
#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
else if (cif->rtype->type == FFI_TYPE_LONGDOUBLE
&& cif->abi != FFI_LINUX && cif->abi != FFI_LINUX_SOFT_FLOAT)
-Index: libffi/ChangeLog
-===================================================================
---- libffi/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libffi/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -1,3 +1,24 @@
-+2008-09-10 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * src/powerpc/ffitarget.h (ffi_abi): Add FFI_LINUX and
-+ FFI_LINUX_SOFT_FLOAT to the POWERPC_FREEBSD enum.
-+ Add note about flag bits used for FFI_SYSV_TYPE_SMALL_STRUCT.
-+ Adjust copyright notice.
-+ * src/powerpc/ffi.c: Add two new flags to indicate if we have one
-+ register or two register to use for FFI_SYSV structs.
-+ (ffi_prep_cif_machdep): Pass the right register flag introduced above.
-+ (ffi_closure_helper_SYSV): Fix the return type for
-+ FFI_SYSV_TYPE_SMALL_STRUCT. Comment.
-+ Adjust copyright notice.
-+
-+2008-08-27 Release Manager
-+
-+ * GCC 4.3.2 released.
-+
-+2008-06-06 Release Manager
-+
-+ * GCC 4.3.1 released.
-+
- 2008-03-05 Release Manager
-
- * GCC 4.3.0 released.
Index: libjava/Makefile.in
===================================================================
---- libjava/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -763,6 +763,7 @@
extra_gij_ldflags = @extra_gij_ldflags@
extra_ldflags = @extra_ldflags@
@@ -2664,8 +3065,8 @@ Index: libjava/libltdl/ChangeLog
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
Index: libjava/libltdl/ChangeLog
===================================================================
---- libjava/libltdl/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/libltdl/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/libltdl/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/libltdl/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,11 @@
+2008-08-27 Release Manager
+
@@ -2680,8 +3081,8 @@ Index: libjava/configure.ac
* GCC 4.3.0 released.
Index: libjava/configure.ac
===================================================================
---- libjava/configure.ac (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/configure.ac (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/configure.ac (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/configure.ac (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1413,6 +1413,7 @@
;;
esac
@@ -2692,8 +3093,8 @@ Index: libjava/classpath/tools/gnu/class
AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string])
Index: libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java
===================================================================
---- libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -217,7 +217,18 @@
MethodNode m = (MethodNode) i.next();
String desc = MethodHelper.getBridgeTarget(m);
@@ -2736,8 +3137,8 @@ Index: libjava/classpath/ChangeLog
methodNameMap.put(sum, nameToUse);
Index: libjava/classpath/ChangeLog
===================================================================
---- libjava/classpath/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/classpath/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/classpath/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/classpath/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,11 @@
+2008-08-27 Release Manager
+
@@ -2752,8 +3153,8 @@ Index: libjava/classpath/ChangeLog.gcj
* GCC 4.3.0 released.
Index: libjava/classpath/ChangeLog.gcj
===================================================================
---- libjava/classpath/ChangeLog.gcj (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/classpath/ChangeLog.gcj (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/classpath/ChangeLog.gcj (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/classpath/ChangeLog.gcj (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,15 @@
+2008-09-14 Matthias Klose <doko@ubuntu.com>
+
@@ -2772,8 +3173,8 @@ Index: libjava/include/Makefile.in
PR libgcj/35950:
Index: libjava/include/Makefile.in
===================================================================
---- libjava/include/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/include/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/include/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/include/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -285,6 +285,7 @@
extra_gij_ldflags = @extra_gij_ldflags@
extra_ldflags = @extra_ldflags@
@@ -2784,8 +3185,8 @@ Index: libjava/include/jvm.h
host = @host@
Index: libjava/include/jvm.h
===================================================================
---- libjava/include/jvm.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/include/jvm.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/include/jvm.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/include/jvm.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -307,6 +307,9 @@
s = signature;
}
@@ -2826,8 +3227,8 @@ Index: libjava/ChangeLog
/* Type of pointer used as finalizer. */
Index: libjava/ChangeLog
===================================================================
---- libjava/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/ChangeLog (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/ChangeLog (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,3 +1,46 @@
+2008-08-27 Release Manager
+
@@ -2877,8 +3278,8 @@ Index: libjava/testsuite/Makefile.in
* link.cc (_Jv_Linker::resolve_method_entry): Remove broken class
Index: libjava/testsuite/Makefile.in
===================================================================
---- libjava/testsuite/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/testsuite/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/testsuite/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/testsuite/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -249,9 +249,6 @@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
@@ -2899,8 +3300,8 @@ Index: libjava/HACKING
host = @host@
Index: libjava/HACKING
===================================================================
---- libjava/HACKING (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/HACKING (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/HACKING (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/HACKING (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -184,6 +184,6 @@
entire contents of the namespace)
@@ -2910,10 +3311,48 @@ Index: libjava/HACKING
+ at that point. This must be run from the source tree, in
+ libjava/classpath/lib; it uses the .class file name to determine
what to print.
+Index: libjava/configure
+===================================================================
+--- libjava/configure (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/configure (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
+@@ -310,7 +310,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -4444,7 +4444,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix[4-9]*)
++aix4-9*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15223,6 +15223,7 @@
+
+
+
++
+ cat >>confdefs.h <<\_ACEOF
+ #define JV_VERSION "1.5.0"
+ _ACEOF
+@@ -17733,6 +17734,7 @@
+ s,@toolexeclibdir@,$toolexeclibdir,;t t
+ s,@GCJVERSION@,$GCJVERSION,;t t
+ s,@dbexecdir@,$dbexecdir,;t t
++s,@gcjsubdir@,$gcjsubdir,;t t
+ s,@gxx_include_dir@,$gxx_include_dir,;t t
+ s,@libstdcxx_incdir@,$libstdcxx_incdir,;t t
+ s,@PERL@,$PERL,;t t
Index: libjava/link.cc
===================================================================
---- libjava/link.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/link.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/link.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/link.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -362,6 +362,19 @@
return the_method;
}
@@ -3079,48 +3518,10 @@ Index: libjava/link.cc
}
}
-Index: libjava/configure
-===================================================================
---- libjava/configure (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/configure (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
-@@ -310,7 +310,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -4444,7 +4444,7 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
--aix[4-9]*)
-+aix4-9*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15223,6 +15223,7 @@
-
-
-
-+
- cat >>confdefs.h <<\_ACEOF
- #define JV_VERSION "1.5.0"
- _ACEOF
-@@ -17733,6 +17734,7 @@
- s,@toolexeclibdir@,$toolexeclibdir,;t t
- s,@GCJVERSION@,$GCJVERSION,;t t
- s,@dbexecdir@,$dbexecdir,;t t
-+s,@gcjsubdir@,$gcjsubdir,;t t
- s,@gxx_include_dir@,$gxx_include_dir,;t t
- s,@libstdcxx_incdir@,$libstdcxx_incdir,;t t
- s,@PERL@,$PERL,;t t
Index: libjava/interpret-run.cc
===================================================================
---- libjava/interpret-run.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/interpret-run.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/interpret-run.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/interpret-run.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -382,13 +382,25 @@
#else // !DEBUG
#undef NEXT_INSN
@@ -3155,8 +3556,8 @@ Index: libjava/gcj/Makefile.in
#endif // !DEBUG
Index: libjava/gcj/Makefile.in
===================================================================
---- libjava/gcj/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/gcj/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/gcj/Makefile.in (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/gcj/Makefile.in (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -286,6 +286,7 @@
extra_gij_ldflags = @extra_gij_ldflags@
extra_ldflags = @extra_ldflags@
@@ -3167,8 +3568,8 @@ Index: libjava/gcj/javaprims.h
host = @host@
Index: libjava/gcj/javaprims.h
===================================================================
---- libjava/gcj/javaprims.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/gcj/javaprims.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/gcj/javaprims.h (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/gcj/javaprims.h (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -440,6 +440,7 @@
class EnumMap$7;
class EnumSet;
@@ -3179,8 +3580,8 @@ Index: libjava/java/lang/natString.cc
class EventListenerProxy;
Index: libjava/java/lang/natString.cc
===================================================================
---- libjava/java/lang/natString.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/java/lang/natString.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/java/lang/natString.cc (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/java/lang/natString.cc (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -1,6 +1,7 @@
// natString.cc - Implementation of java.lang.String native methods.
@@ -3230,8 +3631,8 @@ Index: libjava/Makefile.am
memcpy (elements (new_array), elements (array),
Index: libjava/Makefile.am
===================================================================
---- libjava/Makefile.am (.../tags/ubuntu/gcc-4_2_4-release) (revision 143049)
-+++ libjava/Makefile.am (.../branches/ubuntu/gcc-4_2-branch) (revision 143049)
+--- libjava/Makefile.am (.../tags/ubuntu/gcc-4_2_4-release) (revision 143471)
++++ libjava/Makefile.am (.../branches/ubuntu/gcc-4_2-branch) (revision 143471)
@@ -67,7 +67,8 @@
## Name of the default .db.
db_name = classmap.db
@@ -3242,3 +3643,9 @@ Index: libjava/Makefile.am
## For now, only on native systems. FIXME.
if NATIVE
+
+Property changes on: .
+___________________________________________________________________
+Added: svn:mergeinfo
+ Merged /branches/gcc-4_2-branch:r143240-143470
+