This commit is contained in:
Jakub Jelinek 2010-07-07 10:18:09 +00:00
parent 3828d4db97
commit 5f74d245e0
6 changed files with 172 additions and 5 deletions

View File

@ -1,2 +1,2 @@
fastjar-0.97.tar.gz
gcc-4.4.4-20100630.tar.bz2
gcc-4.4.4-20100707.tar.bz2

View File

@ -1,9 +1,9 @@
%global DATE 20100630
%global SVNREV 161589
%global DATE 20100707
%global SVNREV 161902
%global gcc_version 4.4.4
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 10
%global gcc_release 11
%global _unpackaged_files_terminate_build 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
@ -175,6 +175,8 @@ Patch15: gcc44-libstdc++-docs.patch
Patch16: gcc44-ppc64-aixdesc.patch
Patch17: gcc44-no-add-needed.patch
Patch18: gcc44-pr44542.patch
Patch19: gcc44-rh610785.patch
Patch20: gcc44-rh578382.patch
Patch1000: fastjar-0.97-segfault.patch
Patch1001: fastjar-0.97-len1.patch
@ -514,6 +516,8 @@ GNAT is a GNU Ada 95 front-end to GCC. This package includes static libraries.
%patch17 -p0 -b .no-add-needed~
%endif
%patch18 -p0 -b .pr44542~
%patch19 -p0 -b .rh610785~
%patch20 -p0 -b .rh578382~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@ -2000,6 +2004,18 @@ fi
%endif
%changelog
* Wed Jul 7 2010 Jakub Jelinek <jakub@redhat.com> 4.4.4-11
- update from gcc-4_4-branch
- PRs target/44597, target/44705
- VTA backports
- PR c++/44808
- avoid outputting invalid registers in debug info (#610455)
- -Wunused-but-set-* vector assignment fix (PR c++/44780)
- fix PowerPC address reloading for inline-asms (#608768, PR target/44707)
- fix predictive commoning (#609488, PR tree-optimization/40421)
- fix SRA not to do useless sign-extensions that confuses ivopts (#610785)
- fix IPP handling in libgcj (#578382)
* Wed Jun 30 2010 Jakub Jelinek <jakub@redhat.com> 4.4.4-10
- update from gcc-4_4-branch
- PRs fortran/43841, fortran/43843, tree-optimization/44683

76
gcc44-rh578382.patch Normal file
View File

@ -0,0 +1,76 @@
2010-04-27 Andrew Haley <aph@redhat.com>
* gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle
IppValueTag.UNKNOWN.
* gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes):
Handle RequestedAttributes.
* gnu/javax/print/ipp/IppPrintService.java (processResponse): Add
DocFlavor.SERVICE_FORMATTED.PAGEABLE and
DocFlavor.SERVICE_FORMATTED.PRINTABLE.
--- libjava/classpath/gnu/javax/print/ipp/IppRequest.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppRequest.java (revision 158789)
@@ -434,6 +434,8 @@ public class IppRequest
PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class);
JobUri jobUri = (JobUri) attributes.get(JobUri.class);
JobId jobId = (JobId) attributes.get(JobId.class);
+ RequestedAttributes reqAttrs
+ = (RequestedAttributes)attributes.get(RequestedAttributes.class);
if (printerUri != null && jobId == null && jobUri == null)
{
write(printerUri);
@@ -467,6 +469,12 @@ public class IppRequest
logger.log(Component.IPP, "Attribute: Name: <" + jobUri.getCategory()
.getName() + "> Value: <" + jobUri.toString() + ">");
}
+ else if (reqAttrs != null)
+ {
+ write(reqAttrs);
+ attributes.remove(RequestedAttributes.class);
+ logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">");
+ }
else
{
throw new IppException("Unknown target operation attribute combination.");
--- libjava/classpath/gnu/javax/print/ipp/IppPrintService.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppPrintService.java (revision 158789)
@@ -356,8 +356,17 @@ public class IppPrintService implements
// should not happen, all fields are public
}
}
+
+ if (this.getClass()
+ .isAssignableFrom(gnu.javax.print.CupsPrintService.class))
+ {
+// CUPS always provides filters to convert from Postscript.
+// This logic looks odd, but it's what OpenJDK does.
+ flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE);
+ flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE);
+ }
}
-
+
// printer uris
Set uris = getPrinterAttributeSet(PrinterUriSupported.class);
printerUris = new ArrayList(uris.size());
--- libjava/classpath/gnu/javax/print/ipp/IppResponse.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppResponse.java (revision 158789)
@@ -302,11 +302,14 @@ public class IppResponse
// out-of-band values
case IppValueTag.UNSUPPORTED:
case IppValueTag.UNKNOWN:
- case IppValueTag.NO_VALUE:
// TODO implement out-of-band handling
- // We currently throw an exception to see when it occurs - not yet :-)
- throw new IppException(
- "Unexpected name value for out-of-band value tag");
+ // We currently throw an exception to see when it occurs - not yet :-)
+ throw new IppException(
+ "Unexpected name value for out-of-band value tag " + tag);
+ case IppValueTag.NO_VALUE:
+ attribute = null;
+
+ break;
case IppValueTag.INTEGER:
int intValue = IppUtilities.convertToInt(value);
attribute = IppUtilities.getIntegerAttribute(name, intValue);

74
gcc44-rh610785.patch Normal file
View File

@ -0,0 +1,74 @@
2010-07-07 Jakub Jelinek <jakub@redhat.com>
* tree-sra.c (sra_build_assignment): Don't add BIT_XOR_EXPR/MINUS_EXPR
of signbit if signbit is the most significant bit of utype already.
* gcc.c-torture/execute/20100707-1.c: New test.
--- gcc/tree-sra.c.jj 2010-05-13 13:08:52.000000000 +0200
+++ gcc/tree-sra.c 2010-07-06 19:50:09.000000000 +0200
@@ -2211,7 +2211,10 @@ sra_build_assignment (tree dst, tree src
/* Perform sign extension, if required.
??? This should never be necessary. */
- if (!unsignedp)
+ if (!unsignedp
+ && (TREE_INT_CST_LOW (width) != TYPE_PRECISION (utype)
+ || (TREE_INT_CST_LOW (width)
+ != GET_MODE_BITSIZE (TYPE_MODE (utype)))))
{
tree signbit = int_const_binop (LSHIFT_EXPR,
build_int_cst_wide (utype, 1, 0),
--- gcc/testsuite/gcc.c-torture/execute/20100707-1.c 2010-05-27 15:41:40.446237053 +0200
+++ gcc/testsuite/gcc.c-torture/execute/20100707-1.c 2010-07-06 13:55:35.000000000 +0200
@@ -0,0 +1,50 @@
+struct S { int s; };
+struct T { int w; int h; };
+int vr;
+
+inline struct T
+bar (const struct S * x)
+{
+ struct T t;
+ t.w = vr;
+ t.h = x->s;
+ return t;
+}
+
+__attribute__ ((noinline))
+void foo (struct S * w, unsigned char *x, int y, int *z[2])
+{
+ struct T t;
+ int i, j, k;
+ t = bar (w);
+ k = t.w + 2;
+ for (i = 0; i <= t.h; i++)
+ {
+ int *u = z[i > 0] + 1;
+ unsigned char *v;
+ int q = 0;
+ v = x + k * i + 1;
+ for (j = 0; j < t.w; j++)
+ {
+ int m = u[j];
+ if (m > y && !q && v[j - k] != 2)
+ v[j] = 0;
+ }
+ }
+}
+
+unsigned char b[64];
+
+int
+main (void)
+{
+ int v[32], *z[2];
+ struct S s;
+ __builtin_memset (v, 0, sizeof (v));
+ vr = 16;
+ s.s = 16;
+ z[0] = v;
+ z[1] = v;
+ foo (&s, b + 32, -1, z);
+ return 0;
+}

View File

@ -28,3 +28,4 @@ gcc-4_4_4-7_fc13:F-13:gcc-4.4.4-7.fc13.src.rpm:1275991168
gcc-4_4_4-8_fc13:F-13:gcc-4.4.4-8.fc13.src.rpm:1276244305
gcc-4_4_4-9_fc13:F-13:gcc-4.4.4-9.fc13.src.rpm:1277410568
gcc-4_4_4-10_fc13:F-13:gcc-4.4.4-10.fc13.src.rpm:1277882765
gcc-4_4_4-11_fc13:F-13:gcc-4.4.4-11.fc13.src.rpm:1278497746

View File

@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
1e5a3dc8063ea17ed92939cd01d244d0 gcc-4.4.4-20100630.tar.bz2
ccea98dc838ad0ce98ee1a52ee2931cd gcc-4.4.4-20100707.tar.bz2