4.9.0-0.9
This commit is contained in:
Jakub Jelinek
parent
39b12a1a1b
commit
8d0243eb05
3
.gitignore
vendored
3
.gitignore
vendored
@ -91,3 +91,6 @@
|
|||||||
/gcc-4.8.2-20131212.tar.bz2
|
/gcc-4.8.2-20131212.tar.bz2
|
||||||
/gcc-4.8.2-20140115.tar.bz2
|
/gcc-4.8.2-20140115.tar.bz2
|
||||||
/gcc-4.8.2-20140120.tar.bz2
|
/gcc-4.8.2-20140120.tar.bz2
|
||||||
|
/cloog-0.18.1.tar.gz
|
||||||
|
/gcc-4.9.0-20140409.tar.bz2
|
||||||
|
/isl-0.12.2.tar.bz2
|
||||||
|
|||||||
@ -1,190 +0,0 @@
|
|||||||
2014-01-16 Nick Clifton <nickc@redhat.com>
|
|
||||||
|
|
||||||
PR middle-end/28865
|
|
||||||
* varasm.c (output_constant): Return the number of bytes actually
|
|
||||||
emitted.
|
|
||||||
(output_constructor_array_range): Update the field size with the
|
|
||||||
number of bytes emitted by output_constant.
|
|
||||||
(output_constructor_regular_field): Likewise. Also do not
|
|
||||||
complain if the total number of bytes emitted is now greater
|
|
||||||
than the expected fieldpos.
|
|
||||||
* output.h (output_constant): Update prototype and descriptive
|
|
||||||
comment.
|
|
||||||
|
|
||||||
* gcc.c-torture/compile/pr28865.c: New.
|
|
||||||
* gcc.c-torture/execute/pr28865.c: New.
|
|
||||||
|
|
||||||
--- gcc/varasm.c (revision 206660)
|
|
||||||
+++ gcc/varasm.c (revision 206661)
|
|
||||||
@@ -4474,8 +4474,10 @@ static unsigned HOST_WIDE_INT
|
|
||||||
This includes the pseudo-op such as ".int" or ".byte", and a newline.
|
|
||||||
Assumes output_addressed_constants has been done on EXP already.
|
|
||||||
|
|
||||||
- Generate exactly SIZE bytes of assembler data, padding at the end
|
|
||||||
- with zeros if necessary. SIZE must always be specified.
|
|
||||||
+ Generate at least SIZE bytes of assembler data, padding at the end
|
|
||||||
+ with zeros if necessary. SIZE must always be specified. The returned
|
|
||||||
+ value is the actual number of bytes of assembler data generated, which
|
|
||||||
+ may be bigger than SIZE if the object contains a variable length field.
|
|
||||||
|
|
||||||
SIZE is important for structure constructors,
|
|
||||||
since trailing members may have been omitted from the constructor.
|
|
||||||
@@ -4490,14 +4492,14 @@ static unsigned HOST_WIDE_INT
|
|
||||||
|
|
||||||
ALIGN is the alignment of the data in bits. */
|
|
||||||
|
|
||||||
-void
|
|
||||||
+unsigned HOST_WIDE_INT
|
|
||||||
output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align)
|
|
||||||
{
|
|
||||||
enum tree_code code;
|
|
||||||
unsigned HOST_WIDE_INT thissize;
|
|
||||||
|
|
||||||
if (size == 0 || flag_syntax_only)
|
|
||||||
- return;
|
|
||||||
+ return size;
|
|
||||||
|
|
||||||
/* See if we're trying to initialize a pointer in a non-default mode
|
|
||||||
to the address of some declaration somewhere. If the target says
|
|
||||||
@@ -4562,7 +4564,7 @@ output_constant (tree exp, unsigned HOST
|
|
||||||
&& vec_safe_is_empty (CONSTRUCTOR_ELTS (exp)))
|
|
||||||
{
|
|
||||||
assemble_zeros (size);
|
|
||||||
- return;
|
|
||||||
+ return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TREE_CODE (exp) == FDESC_EXPR)
|
|
||||||
@@ -4574,7 +4576,7 @@ output_constant (tree exp, unsigned HOST
|
|
||||||
#else
|
|
||||||
gcc_unreachable ();
|
|
||||||
#endif
|
|
||||||
- return;
|
|
||||||
+ return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Now output the underlying data. If we've handling the padding, return.
|
|
||||||
@@ -4612,8 +4614,7 @@ output_constant (tree exp, unsigned HOST
|
|
||||||
switch (TREE_CODE (exp))
|
|
||||||
{
|
|
||||||
case CONSTRUCTOR:
|
|
||||||
- output_constructor (exp, size, align, NULL);
|
|
||||||
- return;
|
|
||||||
+ return output_constructor (exp, size, align, NULL);
|
|
||||||
case STRING_CST:
|
|
||||||
thissize = MIN ((unsigned HOST_WIDE_INT)TREE_STRING_LENGTH (exp),
|
|
||||||
size);
|
|
||||||
@@ -4648,11 +4649,10 @@ output_constant (tree exp, unsigned HOST
|
|
||||||
case RECORD_TYPE:
|
|
||||||
case UNION_TYPE:
|
|
||||||
gcc_assert (TREE_CODE (exp) == CONSTRUCTOR);
|
|
||||||
- output_constructor (exp, size, align, NULL);
|
|
||||||
- return;
|
|
||||||
+ return output_constructor (exp, size, align, NULL);
|
|
||||||
|
|
||||||
case ERROR_MARK:
|
|
||||||
- return;
|
|
||||||
+ return 0;
|
|
||||||
|
|
||||||
default:
|
|
||||||
gcc_unreachable ();
|
|
||||||
@@ -4660,6 +4660,8 @@ output_constant (tree exp, unsigned HOST
|
|
||||||
|
|
||||||
if (size > thissize)
|
|
||||||
assemble_zeros (size - thissize);
|
|
||||||
+
|
|
||||||
+ return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -4759,7 +4761,7 @@ output_constructor_array_range (oc_local
|
|
||||||
if (local->val == NULL_TREE)
|
|
||||||
assemble_zeros (fieldsize);
|
|
||||||
else
|
|
||||||
- output_constant (local->val, fieldsize, align2);
|
|
||||||
+ fieldsize = output_constant (local->val, fieldsize, align2);
|
|
||||||
|
|
||||||
/* Count its size. */
|
|
||||||
local->total_bytes += fieldsize;
|
|
||||||
@@ -4808,9 +4810,8 @@ output_constructor_regular_field (oc_loc
|
|
||||||
Note no alignment needed in an array, since that is guaranteed
|
|
||||||
if each element has the proper size. */
|
|
||||||
if ((local->field != NULL_TREE || local->index != NULL_TREE)
|
|
||||||
- && fieldpos != local->total_bytes)
|
|
||||||
+ && fieldpos > local->total_bytes)
|
|
||||||
{
|
|
||||||
- gcc_assert (fieldpos >= local->total_bytes);
|
|
||||||
assemble_zeros (fieldpos - local->total_bytes);
|
|
||||||
local->total_bytes = fieldpos;
|
|
||||||
}
|
|
||||||
@@ -4847,7 +4848,7 @@ output_constructor_regular_field (oc_loc
|
|
||||||
if (local->val == NULL_TREE)
|
|
||||||
assemble_zeros (fieldsize);
|
|
||||||
else
|
|
||||||
- output_constant (local->val, fieldsize, align2);
|
|
||||||
+ fieldsize = output_constant (local->val, fieldsize, align2);
|
|
||||||
|
|
||||||
/* Count its size. */
|
|
||||||
local->total_bytes += fieldsize;
|
|
||||||
--- gcc/output.h (revision 206660)
|
|
||||||
+++ gcc/output.h (revision 206661)
|
|
||||||
@@ -294,11 +294,13 @@ extern void output_quoted_string (FILE *
|
|
||||||
This includes the pseudo-op such as ".int" or ".byte", and a newline.
|
|
||||||
Assumes output_addressed_constants has been done on EXP already.
|
|
||||||
|
|
||||||
- Generate exactly SIZE bytes of assembler data, padding at the end
|
|
||||||
- with zeros if necessary. SIZE must always be specified.
|
|
||||||
+ Generate at least SIZE bytes of assembler data, padding at the end
|
|
||||||
+ with zeros if necessary. SIZE must always be specified. The returned
|
|
||||||
+ value is the actual number of bytes of assembler data generated, which
|
|
||||||
+ may be bigger than SIZE if the object contains a variable length field.
|
|
||||||
|
|
||||||
ALIGN is the alignment in bits that may be assumed for the data. */
|
|
||||||
-extern void output_constant (tree, unsigned HOST_WIDE_INT, unsigned int);
|
|
||||||
+extern unsigned HOST_WIDE_INT output_constant (tree, unsigned HOST_WIDE_INT, unsigned int);
|
|
||||||
|
|
||||||
/* When outputting delayed branch sequences, this rtx holds the
|
|
||||||
sequence being output. It is null when no delayed branch
|
|
||||||
--- gcc/testsuite/gcc.c-torture/execute/pr28865.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.c-torture/execute/pr28865.c (revision 206661)
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+struct A { int a; char b[]; };
|
|
||||||
+union B { struct A a; char b[sizeof (struct A) + 31]; };
|
|
||||||
+union B b = { { 1, "123456789012345678901234567890" } };
|
|
||||||
+union B c = { { 2, "123456789012345678901234567890" } };
|
|
||||||
+
|
|
||||||
+__attribute__((noinline, noclone)) void
|
|
||||||
+foo (int *x[2])
|
|
||||||
+{
|
|
||||||
+ x[0] = &b.a.a;
|
|
||||||
+ x[1] = &c.a.a;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+main ()
|
|
||||||
+{
|
|
||||||
+ int *x[2];
|
|
||||||
+ foo (x);
|
|
||||||
+ if (*x[0] != 1 || *x[1] != 2)
|
|
||||||
+ __builtin_abort ();
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
--- gcc/testsuite/gcc.c-torture/compile/pr28865.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.c-torture/compile/pr28865.c (revision 206661)
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+struct var_len
|
|
||||||
+{
|
|
||||||
+ int field1;
|
|
||||||
+ const char field2[];
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* Note - strictly speaking this array declaration is illegal
|
|
||||||
+ since each element has a variable length. GCC allows it
|
|
||||||
+ (for the moment) because it is used in existing code, such
|
|
||||||
+ as glibc. */
|
|
||||||
+static const struct var_len var_array[] =
|
|
||||||
+{
|
|
||||||
+ { 1, "Long exposure noise reduction" },
|
|
||||||
+ { 2, "Shutter/AE lock buttons" },
|
|
||||||
+ { 3, "Mirror lockup" }
|
|
||||||
+};
|
|
||||||
@ -1,654 +0,0 @@
|
|||||||
2013-06-19 Igor Zamyatin <igor.zamyatin@intel.com>
|
|
||||||
|
|
||||||
* gcc.dg/tree-ssa/loop-19.c: Add -fno-common.
|
|
||||||
|
|
||||||
2013-06-12 Jakub Jelinek <jakub@redhat.com>
|
|
||||||
|
|
||||||
PR target/56564
|
|
||||||
* varasm.c (decl_binds_to_current_def_p): Call binds_local_p
|
|
||||||
target hook even for !TREE_PUBLIC decls. If no resolution info
|
|
||||||
is available, return false for common and external decls.
|
|
||||||
|
|
||||||
* gcc.target/i386/pr56564-1.c: Skip on darwin, mingw and cygwin.
|
|
||||||
* gcc.target/i386/pr56564-3.c: Likewise.
|
|
||||||
|
|
||||||
2013-06-11 Jakub Jelinek <jakub@redhat.com>
|
|
||||||
|
|
||||||
PR target/56564
|
|
||||||
* varasm.c (get_variable_align): Move #endif to the right place.
|
|
||||||
|
|
||||||
2013-06-10 Jakub Jelinek <jakub@redhat.com>
|
|
||||||
|
|
||||||
PR target/56564
|
|
||||||
* varasm.c (align_variable): Don't use DATA_ALIGNMENT or
|
|
||||||
CONSTANT_ALIGNMENT if !decl_binds_to_current_def_p (decl).
|
|
||||||
Use DATA_ABI_ALIGNMENT for that case instead if defined.
|
|
||||||
(get_variable_align): New function.
|
|
||||||
(get_variable_section, emit_bss, emit_common,
|
|
||||||
assemble_variable_contents, place_block_symbol): Use
|
|
||||||
get_variable_align instead of DECL_ALIGN.
|
|
||||||
(assemble_noswitch_variable): Add align argument, use it
|
|
||||||
instead of DECL_ALIGN.
|
|
||||||
(assemble_variable): Adjust caller. Use get_variable_align
|
|
||||||
instead of DECL_ALIGN.
|
|
||||||
* config/i386/i386.h (DATA_ALIGNMENT): Adjust x86_data_alignment
|
|
||||||
caller.
|
|
||||||
(DATA_ABI_ALIGNMENT): Define.
|
|
||||||
* config/i386/i386-protos.h (x86_data_alignment): Adjust prototype.
|
|
||||||
* config/i386/i386.c (x86_data_alignment): Add opt argument. If
|
|
||||||
opt is false, only return the psABI mandated alignment increase.
|
|
||||||
* config/c6x/c6x.h (DATA_ALIGNMENT): Renamed to...
|
|
||||||
(DATA_ABI_ALIGNMENT): ... this.
|
|
||||||
* config/mmix/mmix.h (DATA_ALIGNMENT): Renamed to...
|
|
||||||
(DATA_ABI_ALIGNMENT): ... this.
|
|
||||||
* config/mmix/mmix.c (mmix_data_alignment): Adjust function comment.
|
|
||||||
* config/s390/s390.h (DATA_ALIGNMENT): Renamed to...
|
|
||||||
(DATA_ABI_ALIGNMENT): ... this.
|
|
||||||
* doc/tm.texi.in (DATA_ABI_ALIGNMENT): Document.
|
|
||||||
* doc/tm.texi: Regenerated.
|
|
||||||
|
|
||||||
* gcc.target/i386/pr56564-1.c: New test.
|
|
||||||
* gcc.target/i386/pr56564-2.c: New test.
|
|
||||||
* gcc.target/i386/pr56564-3.c: New test.
|
|
||||||
* gcc.target/i386/pr56564-4.c: New test.
|
|
||||||
* gcc.target/i386/avx256-unaligned-load-4.c: Add -fno-common.
|
|
||||||
* gcc.target/i386/avx256-unaligned-store-1.c: Likewise.
|
|
||||||
* gcc.target/i386/avx256-unaligned-store-3.c: Likewise.
|
|
||||||
* gcc.target/i386/avx256-unaligned-store-4.c: Likewise.
|
|
||||||
* gcc.target/i386/vect-sizes-1.c: Likewise.
|
|
||||||
* gcc.target/i386/memcpy-1.c: Likewise.
|
|
||||||
* gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (tmp): Initialize.
|
|
||||||
* gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (tmp): Likewise.
|
|
||||||
|
|
||||||
--- gcc/doc/tm.texi.in (revision 199897)
|
|
||||||
+++ gcc/doc/tm.texi.in (revision 199898)
|
|
||||||
@@ -1062,6 +1062,15 @@ arrays to be word-aligned so that @code{
|
|
||||||
constants to character arrays can be done inline.
|
|
||||||
@end defmac
|
|
||||||
|
|
||||||
+@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
|
|
||||||
+Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
|
|
||||||
+some alignment increase, instead of optimization only purposes. E.g.@
|
|
||||||
+AMD x86-64 psABI says that variables with array type larger than 15 bytes
|
|
||||||
+must be aligned to 16 byte boundaries.
|
|
||||||
+
|
|
||||||
+If this macro is not defined, then @var{basic-align} is used.
|
|
||||||
+@end defmac
|
|
||||||
+
|
|
||||||
@defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
|
|
||||||
If defined, a C expression to compute the alignment given to a constant
|
|
||||||
that is being placed in memory. @var{constant} is the constant and
|
|
||||||
--- gcc/doc/tm.texi (revision 199897)
|
|
||||||
+++ gcc/doc/tm.texi (revision 199898)
|
|
||||||
@@ -1078,6 +1078,15 @@ arrays to be word-aligned so that @code{
|
|
||||||
constants to character arrays can be done inline.
|
|
||||||
@end defmac
|
|
||||||
|
|
||||||
+@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
|
|
||||||
+Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
|
|
||||||
+some alignment increase, instead of optimization only purposes. E.g.@
|
|
||||||
+AMD x86-64 psABI says that variables with array type larger than 15 bytes
|
|
||||||
+must be aligned to 16 byte boundaries.
|
|
||||||
+
|
|
||||||
+If this macro is not defined, then @var{basic-align} is used.
|
|
||||||
+@end defmac
|
|
||||||
+
|
|
||||||
@defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
|
|
||||||
If defined, a C expression to compute the alignment given to a constant
|
|
||||||
that is being placed in memory. @var{constant} is the constant and
|
|
||||||
--- gcc/varasm.c (revision 199897)
|
|
||||||
+++ gcc/varasm.c (revision 199984)
|
|
||||||
@@ -966,13 +966,80 @@ align_variable (tree decl, bool dont_out
|
|
||||||
align = MAX_OFILE_ALIGNMENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* On some machines, it is good to increase alignment sometimes. */
|
|
||||||
if (! DECL_USER_ALIGN (decl))
|
|
||||||
{
|
|
||||||
+#ifdef DATA_ABI_ALIGNMENT
|
|
||||||
+ unsigned int data_abi_align
|
|
||||||
+ = DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
|
|
||||||
+ /* For backwards compatibility, don't assume the ABI alignment for
|
|
||||||
+ TLS variables. */
|
|
||||||
+ if (! DECL_THREAD_LOCAL_P (decl) || data_abi_align <= BITS_PER_WORD)
|
|
||||||
+ align = data_abi_align;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ /* On some machines, it is good to increase alignment sometimes.
|
|
||||||
+ But as DECL_ALIGN is used both for actually emitting the variable
|
|
||||||
+ and for code accessing the variable as guaranteed alignment, we
|
|
||||||
+ can only increase the alignment if it is a performance optimization
|
|
||||||
+ if the references to it must bind to the current definition. */
|
|
||||||
+ if (decl_binds_to_current_def_p (decl))
|
|
||||||
+ {
|
|
||||||
+#ifdef DATA_ALIGNMENT
|
|
||||||
+ unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
|
|
||||||
+ /* Don't increase alignment too much for TLS variables - TLS space
|
|
||||||
+ is too precious. */
|
|
||||||
+ if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
|
|
||||||
+ align = data_align;
|
|
||||||
+#endif
|
|
||||||
+#ifdef CONSTANT_ALIGNMENT
|
|
||||||
+ if (DECL_INITIAL (decl) != 0
|
|
||||||
+ && DECL_INITIAL (decl) != error_mark_node)
|
|
||||||
+ {
|
|
||||||
+ unsigned int const_align
|
|
||||||
+ = CONSTANT_ALIGNMENT (DECL_INITIAL (decl), align);
|
|
||||||
+ /* Don't increase alignment too much for TLS variables - TLS
|
|
||||||
+ space is too precious. */
|
|
||||||
+ if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD)
|
|
||||||
+ align = const_align;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Reset the alignment in case we have made it tighter, so we can benefit
|
|
||||||
+ from it in get_pointer_alignment. */
|
|
||||||
+ DECL_ALIGN (decl) = align;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* Return DECL_ALIGN (decl), possibly increased for optimization purposes
|
|
||||||
+ beyond what align_variable returned. */
|
|
||||||
+
|
|
||||||
+static unsigned int
|
|
||||||
+get_variable_align (tree decl)
|
|
||||||
+{
|
|
||||||
+ unsigned int align = DECL_ALIGN (decl);
|
|
||||||
+
|
|
||||||
+ /* For user aligned vars or static vars align_variable already did
|
|
||||||
+ everything. */
|
|
||||||
+ if (DECL_USER_ALIGN (decl) || !TREE_PUBLIC (decl))
|
|
||||||
+ return align;
|
|
||||||
+
|
|
||||||
+#ifdef DATA_ABI_ALIGNMENT
|
|
||||||
+ if (DECL_THREAD_LOCAL_P (decl))
|
|
||||||
+ align = DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ /* For decls that bind to the current definition, align_variable
|
|
||||||
+ did also everything, except for not assuming ABI required alignment
|
|
||||||
+ of TLS variables. For other vars, increase the alignment here
|
|
||||||
+ as an optimization. */
|
|
||||||
+ if (!decl_binds_to_current_def_p (decl))
|
|
||||||
+ {
|
|
||||||
+ /* On some machines, it is good to increase alignment sometimes. */
|
|
||||||
#ifdef DATA_ALIGNMENT
|
|
||||||
unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
|
|
||||||
/* Don't increase alignment too much for TLS variables - TLS space
|
|
||||||
- is too precious. */
|
|
||||||
+ is too precious. */
|
|
||||||
if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
|
|
||||||
align = data_align;
|
|
||||||
#endif
|
|
||||||
@@ -989,9 +1056,7 @@ align_variable (tree decl, bool dont_out
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* Reset the alignment in case we have made it tighter, so we can benefit
|
|
||||||
- from it in get_pointer_alignment. */
|
|
||||||
- DECL_ALIGN (decl) = align;
|
|
||||||
+ return align;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return the section into which the given VAR_DECL or CONST_DECL
|
|
||||||
@@ -1043,7 +1108,8 @@ get_variable_section (tree decl, bool pr
|
|
||||||
return bss_noswitch_section;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return targetm.asm_out.select_section (decl, reloc, DECL_ALIGN (decl));
|
|
||||||
+ return targetm.asm_out.select_section (decl, reloc,
|
|
||||||
+ get_variable_align (decl));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return the block into which object_block DECL should be placed. */
|
|
||||||
@@ -1780,7 +1846,8 @@ emit_bss (tree decl ATTRIBUTE_UNUSED,
|
|
||||||
unsigned HOST_WIDE_INT rounded ATTRIBUTE_UNUSED)
|
|
||||||
{
|
|
||||||
#if defined ASM_OUTPUT_ALIGNED_BSS
|
|
||||||
- ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size, DECL_ALIGN (decl));
|
|
||||||
+ ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size,
|
|
||||||
+ get_variable_align (decl));
|
|
||||||
return true;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@@ -1796,10 +1863,11 @@ emit_common (tree decl ATTRIBUTE_UNUSED,
|
|
||||||
{
|
|
||||||
#if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
|
|
||||||
ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, decl, name,
|
|
||||||
- size, DECL_ALIGN (decl));
|
|
||||||
+ size, get_variable_align (decl));
|
|
||||||
return true;
|
|
||||||
#elif defined ASM_OUTPUT_ALIGNED_COMMON
|
|
||||||
- ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size, DECL_ALIGN (decl));
|
|
||||||
+ ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size,
|
|
||||||
+ get_variable_align (decl));
|
|
||||||
return true;
|
|
||||||
#else
|
|
||||||
ASM_OUTPUT_COMMON (asm_out_file, name, size, rounded);
|
|
||||||
@@ -1828,7 +1896,8 @@ emit_tls_common (tree decl ATTRIBUTE_UNU
|
|
||||||
NAME is the name of DECL's SYMBOL_REF. */
|
|
||||||
|
|
||||||
static void
|
|
||||||
-assemble_noswitch_variable (tree decl, const char *name, section *sect)
|
|
||||||
+assemble_noswitch_variable (tree decl, const char *name, section *sect,
|
|
||||||
+ unsigned int align)
|
|
||||||
{
|
|
||||||
unsigned HOST_WIDE_INT size, rounded;
|
|
||||||
|
|
||||||
@@ -1850,7 +1919,7 @@ assemble_noswitch_variable (tree decl, c
|
|
||||||
* (BIGGEST_ALIGNMENT / BITS_PER_UNIT));
|
|
||||||
|
|
||||||
if (!sect->noswitch.callback (decl, name, size, rounded)
|
|
||||||
- && (unsigned HOST_WIDE_INT) DECL_ALIGN_UNIT (decl) > rounded)
|
|
||||||
+ && (unsigned HOST_WIDE_INT) (align / BITS_PER_UNIT) > rounded)
|
|
||||||
warning (0, "requested alignment for %q+D is greater than "
|
|
||||||
"implemented alignment of %wu", decl, rounded);
|
|
||||||
}
|
|
||||||
@@ -1880,7 +1949,7 @@ assemble_variable_contents (tree decl, c
|
|
||||||
/* Output the actual data. */
|
|
||||||
output_constant (DECL_INITIAL (decl),
|
|
||||||
tree_low_cst (DECL_SIZE_UNIT (decl), 1),
|
|
||||||
- DECL_ALIGN (decl));
|
|
||||||
+ get_variable_align (decl));
|
|
||||||
else
|
|
||||||
/* Leave space for it. */
|
|
||||||
assemble_zeros (tree_low_cst (DECL_SIZE_UNIT (decl), 1));
|
|
||||||
@@ -1904,6 +1973,7 @@ assemble_variable (tree decl, int top_le
|
|
||||||
const char *name;
|
|
||||||
rtx decl_rtl, symbol;
|
|
||||||
section *sect;
|
|
||||||
+ unsigned int align;
|
|
||||||
bool asan_protected = false;
|
|
||||||
|
|
||||||
/* This function is supposed to handle VARIABLES. Ensure we have one. */
|
|
||||||
@@ -2003,6 +2073,8 @@ assemble_variable (tree decl, int top_le
|
|
||||||
|
|
||||||
set_mem_align (decl_rtl, DECL_ALIGN (decl));
|
|
||||||
|
|
||||||
+ align = get_variable_align (decl);
|
|
||||||
+
|
|
||||||
if (TREE_PUBLIC (decl))
|
|
||||||
maybe_assemble_visibility (decl);
|
|
||||||
|
|
||||||
@@ -2032,12 +2104,12 @@ assemble_variable (tree decl, int top_le
|
|
||||||
place_block_symbol (symbol);
|
|
||||||
}
|
|
||||||
else if (SECTION_STYLE (sect) == SECTION_NOSWITCH)
|
|
||||||
- assemble_noswitch_variable (decl, name, sect);
|
|
||||||
+ assemble_noswitch_variable (decl, name, sect, align);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
switch_to_section (sect);
|
|
||||||
- if (DECL_ALIGN (decl) > BITS_PER_UNIT)
|
|
||||||
- ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (DECL_ALIGN_UNIT (decl)));
|
|
||||||
+ if (align > BITS_PER_UNIT)
|
|
||||||
+ ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
|
|
||||||
assemble_variable_contents (decl, name, dont_output_data);
|
|
||||||
if (asan_protected)
|
|
||||||
{
|
|
||||||
@@ -6709,10 +6781,10 @@ bool
|
|
||||||
decl_binds_to_current_def_p (tree decl)
|
|
||||||
{
|
|
||||||
gcc_assert (DECL_P (decl));
|
|
||||||
- if (!TREE_PUBLIC (decl))
|
|
||||||
- return true;
|
|
||||||
if (!targetm.binds_local_p (decl))
|
|
||||||
return false;
|
|
||||||
+ if (!TREE_PUBLIC (decl))
|
|
||||||
+ return true;
|
|
||||||
/* When resolution is available, just use it. */
|
|
||||||
if (TREE_CODE (decl) == VAR_DECL
|
|
||||||
&& (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
|
|
||||||
@@ -6730,10 +6802,20 @@ decl_binds_to_current_def_p (tree decl)
|
|
||||||
return resolution_to_local_definition_p (node->symbol.resolution);
|
|
||||||
}
|
|
||||||
/* Otherwise we have to assume the worst for DECL_WEAK (hidden weaks
|
|
||||||
- binds locally but still can be overwritten).
|
|
||||||
+ binds locally but still can be overwritten), DECL_COMMON (can be merged
|
|
||||||
+ with a non-common definition somewhere in the same module) or
|
|
||||||
+ DECL_EXTERNAL.
|
|
||||||
This rely on fact that binds_local_p behave as decl_replaceable_p
|
|
||||||
for all other declaration types. */
|
|
||||||
- return !DECL_WEAK (decl);
|
|
||||||
+ if (DECL_WEAK (decl))
|
|
||||||
+ return false;
|
|
||||||
+ if (DECL_COMMON (decl)
|
|
||||||
+ && (DECL_INITIAL (decl) == NULL
|
|
||||||
+ || DECL_INITIAL (decl) == error_mark_node))
|
|
||||||
+ return false;
|
|
||||||
+ if (DECL_EXTERNAL (decl))
|
|
||||||
+ return false;
|
|
||||||
+ return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* A replaceable function or variable is one which may be replaced
|
|
||||||
@@ -6959,7 +7041,7 @@ place_block_symbol (rtx symbol)
|
|
||||||
else
|
|
||||||
{
|
|
||||||
decl = SYMBOL_REF_DECL (symbol);
|
|
||||||
- alignment = DECL_ALIGN (decl);
|
|
||||||
+ alignment = get_variable_align (decl);
|
|
||||||
size = tree_low_cst (DECL_SIZE_UNIT (decl), 1);
|
|
||||||
if (flag_asan && asan_protect_global (decl))
|
|
||||||
{
|
|
||||||
--- gcc/config/s390/s390.h (revision 199897)
|
|
||||||
+++ gcc/config/s390/s390.h (revision 199898)
|
|
||||||
@@ -221,7 +221,7 @@ enum processor_flags
|
|
||||||
|
|
||||||
/* Alignment on even addresses for LARL instruction. */
|
|
||||||
#define CONSTANT_ALIGNMENT(EXP, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
|
|
||||||
-#define DATA_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
|
|
||||||
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
|
|
||||||
|
|
||||||
/* Alignment is not required by the hardware. */
|
|
||||||
#define STRICT_ALIGNMENT 0
|
|
||||||
--- gcc/config/i386/i386.h (revision 199897)
|
|
||||||
+++ gcc/config/i386/i386.h (revision 199898)
|
|
||||||
@@ -859,7 +859,18 @@ enum target_cpu_default
|
|
||||||
cause character arrays to be word-aligned so that `strcpy' calls
|
|
||||||
that copy constants to character arrays can be done inline. */
|
|
||||||
|
|
||||||
-#define DATA_ALIGNMENT(TYPE, ALIGN) ix86_data_alignment ((TYPE), (ALIGN))
|
|
||||||
+#define DATA_ALIGNMENT(TYPE, ALIGN) \
|
|
||||||
+ ix86_data_alignment ((TYPE), (ALIGN), true)
|
|
||||||
+
|
|
||||||
+/* Similar to DATA_ALIGNMENT, but for the cases where the ABI mandates
|
|
||||||
+ some alignment increase, instead of optimization only purposes. E.g.
|
|
||||||
+ AMD x86-64 psABI says that variables with array type larger than 15 bytes
|
|
||||||
+ must be aligned to 16 byte boundaries.
|
|
||||||
+
|
|
||||||
+ If this macro is not defined, then ALIGN is used. */
|
|
||||||
+
|
|
||||||
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) \
|
|
||||||
+ ix86_data_alignment ((TYPE), (ALIGN), false)
|
|
||||||
|
|
||||||
/* If defined, a C expression to compute the alignment for a local
|
|
||||||
variable. TYPE is the data type, and ALIGN is the alignment that
|
|
||||||
--- gcc/config/i386/i386-protos.h (revision 199897)
|
|
||||||
+++ gcc/config/i386/i386-protos.h (revision 199898)
|
|
||||||
@@ -207,7 +207,7 @@ extern void init_cumulative_args (CUMULA
|
|
||||||
#endif /* RTX_CODE */
|
|
||||||
|
|
||||||
#ifdef TREE_CODE
|
|
||||||
-extern int ix86_data_alignment (tree, int);
|
|
||||||
+extern int ix86_data_alignment (tree, int, bool);
|
|
||||||
extern unsigned int ix86_local_alignment (tree, enum machine_mode,
|
|
||||||
unsigned int);
|
|
||||||
extern unsigned int ix86_minimum_alignment (tree, enum machine_mode,
|
|
||||||
--- gcc/config/i386/i386.c (revision 199897)
|
|
||||||
+++ gcc/config/i386/i386.c (revision 199898)
|
|
||||||
@@ -25292,12 +25292,13 @@ ix86_constant_alignment (tree exp, int a
|
|
||||||
instead of that alignment to align the object. */
|
|
||||||
|
|
||||||
int
|
|
||||||
-ix86_data_alignment (tree type, int align)
|
|
||||||
+ix86_data_alignment (tree type, int align, bool opt)
|
|
||||||
{
|
|
||||||
int max_align
|
|
||||||
= optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT);
|
|
||||||
|
|
||||||
- if (AGGREGATE_TYPE_P (type)
|
|
||||||
+ if (opt
|
|
||||||
+ && AGGREGATE_TYPE_P (type)
|
|
||||||
&& TYPE_SIZE (type)
|
|
||||||
&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
|
|
||||||
&& (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= (unsigned) max_align
|
|
||||||
@@ -25309,14 +25310,17 @@ ix86_data_alignment (tree type, int alig
|
|
||||||
to 16byte boundary. */
|
|
||||||
if (TARGET_64BIT)
|
|
||||||
{
|
|
||||||
- if (AGGREGATE_TYPE_P (type)
|
|
||||||
- && TYPE_SIZE (type)
|
|
||||||
- && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
|
|
||||||
- && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
|
|
||||||
- || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
|
|
||||||
+ if ((opt ? AGGREGATE_TYPE_P (type) : TREE_CODE (type) == ARRAY_TYPE)
|
|
||||||
+ && TYPE_SIZE (type)
|
|
||||||
+ && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
|
|
||||||
+ && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
|
|
||||||
+ || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
|
|
||||||
return 128;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (!opt)
|
|
||||||
+ return align;
|
|
||||||
+
|
|
||||||
if (TREE_CODE (type) == ARRAY_TYPE)
|
|
||||||
{
|
|
||||||
if (TYPE_MODE (TREE_TYPE (type)) == DFmode && align < 64)
|
|
||||||
--- gcc/config/c6x/c6x.h (revision 199897)
|
|
||||||
+++ gcc/config/c6x/c6x.h (revision 199898)
|
|
||||||
@@ -134,7 +134,7 @@ extern c6x_cpu_t c6x_arch;
|
|
||||||
Really only externally visible arrays must be aligned this way, as
|
|
||||||
only those are directly visible from another compilation unit. But
|
|
||||||
we don't have that information available here. */
|
|
||||||
-#define DATA_ALIGNMENT(TYPE, ALIGN) \
|
|
||||||
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) \
|
|
||||||
(((ALIGN) < BITS_PER_UNIT * 8 && TREE_CODE (TYPE) == ARRAY_TYPE) \
|
|
||||||
? BITS_PER_UNIT * 8 : (ALIGN))
|
|
||||||
|
|
||||||
--- gcc/config/mmix/mmix.h (revision 199897)
|
|
||||||
+++ gcc/config/mmix/mmix.h (revision 199898)
|
|
||||||
@@ -164,7 +164,7 @@ struct GTY(()) machine_function
|
|
||||||
/* Copied from elfos.h. */
|
|
||||||
#define MAX_OFILE_ALIGNMENT (32768 * 8)
|
|
||||||
|
|
||||||
-#define DATA_ALIGNMENT(TYPE, BASIC_ALIGN) \
|
|
||||||
+#define DATA_ABI_ALIGNMENT(TYPE, BASIC_ALIGN) \
|
|
||||||
mmix_data_alignment (TYPE, BASIC_ALIGN)
|
|
||||||
|
|
||||||
#define CONSTANT_ALIGNMENT(CONSTANT, BASIC_ALIGN) \
|
|
||||||
--- gcc/config/mmix/mmix.c (revision 199897)
|
|
||||||
+++ gcc/config/mmix/mmix.c (revision 199898)
|
|
||||||
@@ -313,7 +313,7 @@ mmix_init_machine_status (void)
|
|
||||||
return ggc_alloc_cleared_machine_function ();
|
|
||||||
}
|
|
||||||
|
|
||||||
-/* DATA_ALIGNMENT.
|
|
||||||
+/* DATA_ABI_ALIGNMENT.
|
|
||||||
We have trouble getting the address of stuff that is located at other
|
|
||||||
than 32-bit alignments (GETA requirements), so try to give everything
|
|
||||||
at least 32-bit alignment. */
|
|
||||||
--- gcc/testsuite/gcc.target/i386/memcpy-1.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/memcpy-1.c (revision 199898)
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
/* { dg-require-effective-target ia32 } */
|
|
||||||
-/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops" } */
|
|
||||||
+/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops -fno-common" } */
|
|
||||||
/* { dg-final { scan-assembler "rep" } } */
|
|
||||||
/* { dg-final { scan-assembler "movs" } } */
|
|
||||||
/* { dg-final { scan-assembler-not "test" } } */
|
|
||||||
--- gcc/testsuite/gcc.target/i386/vect-sizes-1.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/vect-sizes-1.c (revision 199898)
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
-/* { dg-options "-O3 -ffast-math -mavx -mtune=generic" } */
|
|
||||||
+/* { dg-options "-O3 -ffast-math -mavx -mtune=generic -fno-common" } */
|
|
||||||
|
|
||||||
double a[1024];
|
|
||||||
|
|
||||||
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (revision 199898)
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
|
|
||||||
+/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
|
|
||||||
|
|
||||||
#define N 1024
|
|
||||||
|
|
||||||
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (revision 199898)
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store" } */
|
|
||||||
+/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -fno-common" } */
|
|
||||||
|
|
||||||
#define N 1024
|
|
||||||
|
|
||||||
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (revision 199898)
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic" } */
|
|
||||||
+/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic -fno-common" } */
|
|
||||||
|
|
||||||
#define N 1024
|
|
||||||
|
|
||||||
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (revision 199898)
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/* { dg-do compile } */
|
|
||||||
-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
|
|
||||||
+/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
|
|
||||||
|
|
||||||
#define N 1024
|
|
||||||
|
|
||||||
--- gcc/testsuite/gcc.target/i386/pr56564-1.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/pr56564-1.c (revision 199985)
|
|
||||||
@@ -0,0 +1,26 @@
|
|
||||||
+/* PR target/56564 */
|
|
||||||
+/* { dg-do compile { target { fpic && lp64 } } } */
|
|
||||||
+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
|
|
||||||
+/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
|
|
||||||
+
|
|
||||||
+struct S { long a, b; } s = { 5, 6 };
|
|
||||||
+char t[16] = { 7 };
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+foo (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &s) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+bar (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &t[0]) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
|
||||||
--- gcc/testsuite/gcc.target/i386/pr56564-2.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/pr56564-2.c (revision 199898)
|
|
||||||
@@ -0,0 +1,25 @@
|
|
||||||
+/* PR target/56564 */
|
|
||||||
+/* { dg-do compile { target { *-*-linux* && lp64 } } } */
|
|
||||||
+/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
|
|
||||||
+
|
|
||||||
+struct S { long a, b; } s = { 5, 6 };
|
|
||||||
+char t[16] = { 7 };
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+foo (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &s) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+bar (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &t[0]) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&s" 0 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "return 0" 2 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
|
||||||
--- gcc/testsuite/gcc.target/i386/pr56564-3.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/pr56564-3.c (revision 199985)
|
|
||||||
@@ -0,0 +1,29 @@
|
|
||||||
+/* PR target/56564 */
|
|
||||||
+/* { dg-do compile { target { fpic && lp64 } } } */
|
|
||||||
+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
|
|
||||||
+/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
|
|
||||||
+
|
|
||||||
+__thread struct S { long a, b; } s = { 5, 6 };
|
|
||||||
+__thread char t[16] = { 7 };
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+foo (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &s) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* For backwards compatibility we don't assume that t must
|
|
||||||
+ be aligned to 16 bytes, but align it anyway. */
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+bar (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &t[0]) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "&t" 1 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-tree-dump-times "return 0" 0 "optimized" } } */
|
|
||||||
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
|
||||||
--- gcc/testsuite/gcc.target/i386/pr56564-4.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.target/i386/pr56564-4.c (revision 199898)
|
|
||||||
@@ -0,0 +1,22 @@
|
|
||||||
+/* PR target/56564 */
|
|
||||||
+/* { dg-do compile { target { *-*-linux* && lp64 } } } */
|
|
||||||
+/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
|
|
||||||
+
|
|
||||||
+__thread struct S { long a, b; } s = { 5, 6 };
|
|
||||||
+__thread char t[16] = { 7 };
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+foo (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &s) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+bar (void)
|
|
||||||
+{
|
|
||||||
+ return ((__UINTPTR_TYPE__) &t[0]) & 15;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
|
|
||||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
|
||||||
--- gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (revision 199898)
|
|
||||||
@@ -18,7 +18,7 @@ struct s{
|
|
||||||
struct t e; /* unaligned (offset 2N+4N+4 B) */
|
|
||||||
};
|
|
||||||
|
|
||||||
-struct s tmp;
|
|
||||||
+struct s tmp = { 1 };
|
|
||||||
|
|
||||||
int main1 ()
|
|
||||||
{
|
|
||||||
--- gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (revision 199897)
|
|
||||||
+++ gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (revision 199898)
|
|
||||||
@@ -18,7 +18,7 @@ struct s{
|
|
||||||
struct t e; /* unaligned (offset 2N+4N+4 B) */
|
|
||||||
};
|
|
||||||
|
|
||||||
-struct s tmp;
|
|
||||||
+struct s tmp = { 1 };
|
|
||||||
|
|
||||||
int main1 ()
|
|
||||||
{
|
|
||||||
--- gcc/testsuite/gcc.dg/tree-ssa/loop-19.c (revision 200212)
|
|
||||||
+++ gcc/testsuite/gcc.dg/tree-ssa/loop-19.c (revision 200213)
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
|
|
||||||
/* { dg-do compile { target { i?86-*-* || { x86_64-*-* || powerpc_hard_double } } } } */
|
|
||||||
/* { dg-require-effective-target nonpic } */
|
|
||||||
-/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized" } */
|
|
||||||
+/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized -fno-common" } */
|
|
||||||
|
|
||||||
# define N 2000000
|
|
||||||
double a[N],c[N];
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
2014-02-14 Kyle McMartin <kyle@redhat.com>
|
|
||||||
|
|
||||||
PR pch/60010
|
|
||||||
* config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for AArch64.
|
|
||||||
|
|
||||||
--- gcc/config/host-linux.c (revision 207784)
|
|
||||||
+++ gcc/config/host-linux.c (revision 207785)
|
|
||||||
@@ -86,6 +86,8 @@
|
|
||||||
# define TRY_EMPTY_VM_SPACE 0x60000000
|
|
||||||
#elif defined(__mc68000__)
|
|
||||||
# define TRY_EMPTY_VM_SPACE 0x40000000
|
|
||||||
+#elif defined(__aarch64__)
|
|
||||||
+# define TRY_EMPTY_VM_SPACE 0x1000000000
|
|
||||||
#elif defined(__ARM_EABI__)
|
|
||||||
# define TRY_EMPTY_VM_SPACE 0x60000000
|
|
||||||
#elif defined(__mips__) && defined(__LP64__)
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
2014-02-19 Jason Merrill <jason@redhat.com>
|
|
||||||
|
|
||||||
PR c++/60046
|
|
||||||
* pt.c (maybe_instantiate_noexcept): Don't instantiate exception
|
|
||||||
spec from template context.
|
|
||||||
|
|
||||||
--- gcc/cp/pt.c (revision 207920)
|
|
||||||
+++ gcc/cp/pt.c (revision 207921)
|
|
||||||
@@ -18567,6 +18567,10 @@ maybe_instantiate_noexcept (tree fn)
|
|
||||||
{
|
|
||||||
tree fntype, spec, noex, clone;
|
|
||||||
|
|
||||||
+ /* Don't instantiate a noexcept-specification from template context. */
|
|
||||||
+ if (processing_template_decl)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (DECL_CLONED_FUNCTION_P (fn))
|
|
||||||
fn = DECL_CLONED_FUNCTION (fn);
|
|
||||||
fntype = TREE_TYPE (fn);
|
|
||||||
--- gcc/testsuite/g++.dg/cpp0x/noexcept22.C (revision 0)
|
|
||||||
+++ gcc/testsuite/g++.dg/cpp0x/noexcept22.C (revision 207921)
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+// PR c++/60046
|
|
||||||
+// { dg-require-effective-target c++11 }
|
|
||||||
+
|
|
||||||
+constexpr bool foo () { return noexcept (true); }
|
|
||||||
+template <typename T>
|
|
||||||
+struct V
|
|
||||||
+{
|
|
||||||
+ void bar (V &) noexcept (foo ()) {}
|
|
||||||
+};
|
|
||||||
+template <typename T>
|
|
||||||
+struct W : public V <int>
|
|
||||||
+{
|
|
||||||
+ void bar (W &x) { V <int>::bar (x); }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+int
|
|
||||||
+main ()
|
|
||||||
+{
|
|
||||||
+ W <int> a, b;
|
|
||||||
+ a.bar (b);
|
|
||||||
+}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
2014-02-11 Michael Meissner <meissner@linux.vnet.ibm.com>
|
|
||||||
|
|
||||||
PR target/60137
|
|
||||||
* config/rs6000/rs6000.md (128-bit GPR splitter): Add a splitter
|
|
||||||
for VSX/Altivec vectors that land in GPR registers.
|
|
||||||
|
|
||||||
* gcc.target/powerpc/pr60137.c: New file.
|
|
||||||
|
|
||||||
--- gcc/config/rs6000/rs6000.md (revision 207698)
|
|
||||||
+++ gcc/config/rs6000/rs6000.md (revision 207699)
|
|
||||||
@@ -9963,6 +9963,15 @@ (define_insn_and_split "reload_vsx_from_
|
|
||||||
[(set_attr "length" "12")
|
|
||||||
(set_attr "type" "three")])
|
|
||||||
|
|
||||||
+(define_split
|
|
||||||
+ [(set (match_operand:FMOVE128_GPR 0 "nonimmediate_operand" "")
|
|
||||||
+ (match_operand:FMOVE128_GPR 1 "input_operand" ""))]
|
|
||||||
+ "reload_completed
|
|
||||||
+ && (int_reg_operand (operands[0], <MODE>mode)
|
|
||||||
+ || int_reg_operand (operands[1], <MODE>mode))"
|
|
||||||
+ [(pc)]
|
|
||||||
+{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
|
|
||||||
+
|
|
||||||
;; Move SFmode to a VSX from a GPR register. Because scalar floating point
|
|
||||||
;; type is stored internally as double precision in the VSX registers, we have
|
|
||||||
;; to convert it from the vector format.
|
|
||||||
--- gcc/testsuite/gcc.target/powerpc/pr60137.c (revision 0)
|
|
||||||
+++ gcc/testsuite/gcc.target/powerpc/pr60137.c (revision 207699)
|
|
||||||
@@ -0,0 +1,17 @@
|
|
||||||
+/* { dg-do compile { target { powerpc*-*-* } } } */
|
|
||||||
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
|
|
||||||
+/* { dg-require-effective-target powerpc_p8vector_ok } */
|
|
||||||
+/* { dg-options "-mcpu=power8 -O3 -mno-vsx" } */
|
|
||||||
+
|
|
||||||
+/* target/60137, compiler got a 'could not split insn error'. */
|
|
||||||
+
|
|
||||||
+extern int target_flags;
|
|
||||||
+extern char fixed_regs[53];
|
|
||||||
+extern char call_used_regs[53];
|
|
||||||
+
|
|
||||||
+void init_reg_sets_1(void)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+ for (i = 0; i < 53; i++)
|
|
||||||
+ fixed_regs[i] = call_used_regs[i] = (call_used_regs[i] &((target_flags & 0x02000000) ? 2 : 1)) != 0;
|
|
||||||
+}
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- gcc/Makefile.in.jj 2012-12-13 17:09:20.000000000 +0100
|
--- gcc/Makefile.in.jj 2012-12-13 17:09:20.000000000 +0100
|
||||||
+++ gcc/Makefile.in 2012-12-14 11:45:22.585670055 +0100
|
+++ gcc/Makefile.in 2012-12-14 11:45:22.585670055 +0100
|
||||||
@@ -1022,7 +1022,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
|
@@ -1006,7 +1006,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
|
||||||
# and the system's installed libraries.
|
# and the system's installed libraries.
|
||||||
LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
|
LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
|
||||||
$(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
|
$(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
|
||||||
@ -9,10 +9,10 @@
|
|||||||
$(ZLIB)
|
$(ZLIB)
|
||||||
# Any system libraries needed just for GNAT.
|
# Any system libraries needed just for GNAT.
|
||||||
SYSLIBS = @GNAT_LIBEXC@
|
SYSLIBS = @GNAT_LIBEXC@
|
||||||
@@ -3442,6 +3442,15 @@ $(common_out_object_file): $(common_out_
|
@@ -2011,6 +2011,15 @@ $(out_object_file): $(out_file)
|
||||||
$(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(OPTS_H) $(TM_H) $(TM_P_H) $(MACHMODE_H)
|
$(common_out_object_file): $(common_out_file)
|
||||||
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
|
$(COMPILE) $<
|
||||||
$< $(OUTPUT_OPTION)
|
$(POSTCOMPILE)
|
||||||
+
|
+
|
||||||
+graphite%.o : \
|
+graphite%.o : \
|
||||||
+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
|
+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
|
||||||
@ -27,7 +27,7 @@
|
|||||||
# and compile them.
|
# and compile them.
|
||||||
--- gcc/graphite-poly.h.jj 2012-12-13 11:31:27.000000000 +0100
|
--- gcc/graphite-poly.h.jj 2012-12-13 11:31:27.000000000 +0100
|
||||||
+++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
|
+++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
|
||||||
@@ -22,6 +22,369 @@ along with GCC; see the file COPYING3.
|
@@ -22,6 +22,371 @@ along with GCC; see the file COPYING3.
|
||||||
#ifndef GCC_GRAPHITE_POLY_H
|
#ifndef GCC_GRAPHITE_POLY_H
|
||||||
#define GCC_GRAPHITE_POLY_H
|
#define GCC_GRAPHITE_POLY_H
|
||||||
|
|
||||||
@ -163,6 +163,7 @@
|
|||||||
+ DYNSYM (isl_set_is_empty); \
|
+ DYNSYM (isl_set_is_empty); \
|
||||||
+ DYNSYM (isl_set_max); \
|
+ DYNSYM (isl_set_max); \
|
||||||
+ DYNSYM (isl_set_min); \
|
+ DYNSYM (isl_set_min); \
|
||||||
|
+ DYNSYM (isl_set_n_dim); \
|
||||||
+ DYNSYM (isl_set_nat_universe); \
|
+ DYNSYM (isl_set_nat_universe); \
|
||||||
+ DYNSYM (isl_set_project_out); \
|
+ DYNSYM (isl_set_project_out); \
|
||||||
+ DYNSYM (isl_set_set_tuple_id); \
|
+ DYNSYM (isl_set_set_tuple_id); \
|
||||||
@ -345,6 +346,7 @@
|
|||||||
+#define isl_set_is_empty (*cloog_pointers__.p_isl_set_is_empty)
|
+#define isl_set_is_empty (*cloog_pointers__.p_isl_set_is_empty)
|
||||||
+#define isl_set_max (*cloog_pointers__.p_isl_set_max)
|
+#define isl_set_max (*cloog_pointers__.p_isl_set_max)
|
||||||
+#define isl_set_min (*cloog_pointers__.p_isl_set_min)
|
+#define isl_set_min (*cloog_pointers__.p_isl_set_min)
|
||||||
|
+#define isl_set_n_dim (*cloog_pointers__.p_isl_set_n_dim)
|
||||||
+#define isl_set_nat_universe (*cloog_pointers__.p_isl_set_nat_universe)
|
+#define isl_set_nat_universe (*cloog_pointers__.p_isl_set_nat_universe)
|
||||||
+#define isl_set_project_out (*cloog_pointers__.p_isl_set_project_out)
|
+#define isl_set_project_out (*cloog_pointers__.p_isl_set_project_out)
|
||||||
+#define isl_set_set_tuple_id (*cloog_pointers__.p_isl_set_set_tuple_id)
|
+#define isl_set_set_tuple_id (*cloog_pointers__.p_isl_set_set_tuple_id)
|
||||||
@ -399,7 +401,7 @@
|
|||||||
typedef struct poly_bb *poly_bb_p;
|
typedef struct poly_bb *poly_bb_p;
|
||||||
--- gcc/graphite.c.jj 2012-12-13 11:31:00.000000000 +0100
|
--- gcc/graphite.c.jj 2012-12-13 11:31:00.000000000 +0100
|
||||||
+++ gcc/graphite.c 2012-12-14 13:40:44.155136961 +0100
|
+++ gcc/graphite.c 2012-12-14 13:40:44.155136961 +0100
|
||||||
@@ -66,6 +66,34 @@ along with GCC; see the file COPYING3.
|
@@ -78,6 +78,34 @@ along with GCC; see the file COPYING3.
|
||||||
|
|
||||||
CloogState *cloog_state;
|
CloogState *cloog_state;
|
||||||
|
|
||||||
@ -434,11 +436,11 @@
|
|||||||
/* Print global statistics to FILE. */
|
/* Print global statistics to FILE. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -264,6 +292,15 @@ graphite_transform_loops (void)
|
@@ -277,6 +305,15 @@ graphite_transform_loops (void)
|
||||||
if (parallelized_function_p (cfun->decl))
|
if (parallelized_function_p (cfun->decl))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
+ if (number_of_loops () <= 1)
|
+ if (number_of_loops (cfun) <= 1)
|
||||||
+ return;
|
+ return;
|
||||||
+
|
+
|
||||||
+ if (!init_cloog_pointers ())
|
+ if (!init_cloog_pointers ())
|
||||||
@ -448,7 +450,7 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
ctx = isl_ctx_alloc ();
|
ctx = isl_ctx_alloc ();
|
||||||
isl_options_set_on_error(ctx, ISL_ON_ERROR_ABORT);
|
isl_options_set_on_error (ctx, ISL_ON_ERROR_ABORT);
|
||||||
if (!graphite_initialize (ctx))
|
if (!graphite_initialize (ctx))
|
||||||
--- gcc/graphite-clast-to-gimple.c.jj 2012-12-13 11:31:27.000000000 +0100
|
--- gcc/graphite-clast-to-gimple.c.jj 2012-12-13 11:31:27.000000000 +0100
|
||||||
+++ gcc/graphite-clast-to-gimple.c 2012-12-14 13:27:47.196519858 +0100
|
+++ gcc/graphite-clast-to-gimple.c 2012-12-14 13:27:47.196519858 +0100
|
||||||
@ -1,30 +1,26 @@
|
|||||||
--- libgo/Makefile.am.jj 2013-12-12 19:01:49.000000000 +0100
|
--- libgo/Makefile.am.jj 2014-01-08 13:53:06.000000000 +0100
|
||||||
+++ libgo/Makefile.am 2014-02-18 17:31:54.798484657 +0100
|
+++ libgo/Makefile.am 2014-03-05 15:20:09.938466093 +0100
|
||||||
@@ -1109,8 +1109,7 @@ go_crypto_dsa_files = \
|
@@ -1133,7 +1133,6 @@ go_crypto_ecdsa_files = \
|
||||||
go_crypto_ecdsa_files = \
|
|
||||||
go/crypto/ecdsa/ecdsa.go
|
go/crypto/ecdsa/ecdsa.go
|
||||||
go_crypto_elliptic_files = \
|
go_crypto_elliptic_files = \
|
||||||
- go/crypto/elliptic/elliptic.go \
|
go/crypto/elliptic/elliptic.go \
|
||||||
- go/crypto/elliptic/p224.go
|
- go/crypto/elliptic/p224.go \
|
||||||
+ go/crypto/elliptic/elliptic.go
|
go/crypto/elliptic/p256.go
|
||||||
go_crypto_hmac_files = \
|
go_crypto_hmac_files = \
|
||||||
go/crypto/hmac/hmac.go
|
go/crypto/hmac/hmac.go
|
||||||
go_crypto_md5_files = \
|
--- libgo/Makefile.in.jj 2014-01-08 13:53:06.000000000 +0100
|
||||||
--- libgo/Makefile.in.jj 2013-12-12 19:01:49.000000000 +0100
|
+++ libgo/Makefile.in 2014-03-05 15:20:20.372465471 +0100
|
||||||
+++ libgo/Makefile.in 2014-02-18 17:32:11.350389191 +0100
|
@@ -1291,7 +1291,6 @@ go_crypto_ecdsa_files = \
|
||||||
@@ -1274,8 +1274,7 @@ go_crypto_ecdsa_files = \
|
|
||||||
go/crypto/ecdsa/ecdsa.go
|
|
||||||
|
|
||||||
go_crypto_elliptic_files = \
|
go_crypto_elliptic_files = \
|
||||||
- go/crypto/elliptic/elliptic.go \
|
go/crypto/elliptic/elliptic.go \
|
||||||
- go/crypto/elliptic/p224.go
|
- go/crypto/elliptic/p224.go \
|
||||||
+ go/crypto/elliptic/elliptic.go
|
go/crypto/elliptic/p256.go
|
||||||
|
|
||||||
go_crypto_hmac_files = \
|
go_crypto_hmac_files = \
|
||||||
go/crypto/hmac/hmac.go
|
--- libgo/go/crypto/elliptic/elliptic.go.jj 2013-11-07 11:59:09.000000000 +0100
|
||||||
--- libgo/go/crypto/elliptic/elliptic.go.jj 2012-12-13 11:32:02.640039537 +0100
|
+++ libgo/go/crypto/elliptic/elliptic.go 2014-03-05 15:21:04.186462859 +0100
|
||||||
+++ libgo/go/crypto/elliptic/elliptic.go 2014-02-18 17:28:22.909692022 +0100
|
@@ -326,7 +326,6 @@ var p384 *CurveParams
|
||||||
@@ -327,7 +327,6 @@ var p384 *CurveParams
|
|
||||||
var p521 *CurveParams
|
var p521 *CurveParams
|
||||||
|
|
||||||
func initAll() {
|
func initAll() {
|
||||||
@ -32,16 +28,16 @@
|
|||||||
initP256()
|
initP256()
|
||||||
initP384()
|
initP384()
|
||||||
initP521()
|
initP521()
|
||||||
--- libgo/go/crypto/elliptic/elliptic_test.go.jj 2012-12-13 11:32:02.640039537 +0100
|
--- libgo/go/crypto/elliptic/elliptic_test.go.jj 2013-11-07 11:59:09.000000000 +0100
|
||||||
+++ libgo/go/crypto/elliptic/elliptic_test.go 2014-02-18 17:31:04.052774265 +0100
|
+++ libgo/go/crypto/elliptic/elliptic_test.go 2014-03-05 15:46:03.739373453 +0100
|
||||||
@@ -5,329 +5,14 @@
|
@@ -5,26 +5,16 @@
|
||||||
package elliptic
|
package elliptic
|
||||||
|
|
||||||
import (
|
import (
|
||||||
- "crypto/rand"
|
- "crypto/rand"
|
||||||
- "encoding/hex"
|
- "encoding/hex"
|
||||||
- "fmt"
|
- "fmt"
|
||||||
- "math/big"
|
"math/big"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -52,274 +48,20 @@
|
|||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
-
|
-
|
||||||
-type baseMultTest struct {
|
type baseMultTest struct {
|
||||||
- k string
|
k string
|
||||||
- x, y string
|
x, y string
|
||||||
-}
|
}
|
||||||
-
|
|
||||||
-var p224BaseMultTests = []baseMultTest{
|
-var p224BaseMultTests = []baseMultTest{
|
||||||
- {
|
+var p256BaseMultTests = []baseMultTest{
|
||||||
- "1",
|
{
|
||||||
- "b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
|
"1",
|
||||||
- "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
|
"b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
|
||||||
- },
|
@@ -287,47 +277,12 @@ var p224BaseMultTests = []baseMultTest{
|
||||||
- {
|
},
|
||||||
- "2",
|
}
|
||||||
- "706a46dc76dcb76798e60e6d89474788d16dc18032d268fd1a704fa6",
|
|
||||||
- "1c2b76a7bc25e7702a704fa986892849fca629487acf3709d2e4e8bb",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "3",
|
|
||||||
- "df1b1d66a551d0d31eff822558b9d2cc75c2180279fe0d08fd896d04",
|
|
||||||
- "a3f7f03cadd0be444c0aa56830130ddf77d317344e1af3591981a925",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "4",
|
|
||||||
- "ae99feebb5d26945b54892092a8aee02912930fa41cd114e40447301",
|
|
||||||
- "482580a0ec5bc47e88bc8c378632cd196cb3fa058a7114eb03054c9",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "5",
|
|
||||||
- "31c49ae75bce7807cdff22055d94ee9021fedbb5ab51c57526f011aa",
|
|
||||||
- "27e8bff1745635ec5ba0c9f1c2ede15414c6507d29ffe37e790a079b",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "6",
|
|
||||||
- "1f2483f82572251fca975fea40db821df8ad82a3c002ee6c57112408",
|
|
||||||
- "89faf0ccb750d99b553c574fad7ecfb0438586eb3952af5b4b153c7e",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "7",
|
|
||||||
- "db2f6be630e246a5cf7d99b85194b123d487e2d466b94b24a03c3e28",
|
|
||||||
- "f3a30085497f2f611ee2517b163ef8c53b715d18bb4e4808d02b963",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "8",
|
|
||||||
- "858e6f9cc6c12c31f5df124aa77767b05c8bc021bd683d2b55571550",
|
|
||||||
- "46dcd3ea5c43898c5c5fc4fdac7db39c2f02ebee4e3541d1e78047a",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "9",
|
|
||||||
- "2fdcccfee720a77ef6cb3bfbb447f9383117e3daa4a07e36ed15f78d",
|
|
||||||
- "371732e4f41bf4f7883035e6a79fcedc0e196eb07b48171697517463",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "10",
|
|
||||||
- "aea9e17a306517eb89152aa7096d2c381ec813c51aa880e7bee2c0fd",
|
|
||||||
- "39bb30eab337e0a521b6cba1abe4b2b3a3e524c14a3fe3eb116b655f",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "11",
|
|
||||||
- "ef53b6294aca431f0f3c22dc82eb9050324f1d88d377e716448e507c",
|
|
||||||
- "20b510004092e96636cfb7e32efded8265c266dfb754fa6d6491a6da",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "12",
|
|
||||||
- "6e31ee1dc137f81b056752e4deab1443a481033e9b4c93a3044f4f7a",
|
|
||||||
- "207dddf0385bfdeab6e9acda8da06b3bbef224a93ab1e9e036109d13",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13",
|
|
||||||
- "34e8e17a430e43289793c383fac9774247b40e9ebd3366981fcfaeca",
|
|
||||||
- "252819f71c7fb7fbcb159be337d37d3336d7feb963724fdfb0ecb767",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "14",
|
|
||||||
- "a53640c83dc208603ded83e4ecf758f24c357d7cf48088b2ce01e9fa",
|
|
||||||
- "d5814cd724199c4a5b974a43685fbf5b8bac69459c9469bc8f23ccaf",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "15",
|
|
||||||
- "baa4d8635511a7d288aebeedd12ce529ff102c91f97f867e21916bf9",
|
|
||||||
- "979a5f4759f80f4fb4ec2e34f5566d595680a11735e7b61046127989",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "16",
|
|
||||||
- "b6ec4fe1777382404ef679997ba8d1cc5cd8e85349259f590c4c66d",
|
|
||||||
- "3399d464345906b11b00e363ef429221f2ec720d2f665d7dead5b482",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "17",
|
|
||||||
- "b8357c3a6ceef288310e17b8bfeff9200846ca8c1942497c484403bc",
|
|
||||||
- "ff149efa6606a6bd20ef7d1b06bd92f6904639dce5174db6cc554a26",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "18",
|
|
||||||
- "c9ff61b040874c0568479216824a15eab1a838a797d189746226e4cc",
|
|
||||||
- "ea98d60e5ffc9b8fcf999fab1df7e7ef7084f20ddb61bb045a6ce002",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "19",
|
|
||||||
- "a1e81c04f30ce201c7c9ace785ed44cc33b455a022f2acdbc6cae83c",
|
|
||||||
- "dcf1f6c3db09c70acc25391d492fe25b4a180babd6cea356c04719cd",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "20",
|
|
||||||
- "fcc7f2b45df1cd5a3c0c0731ca47a8af75cfb0347e8354eefe782455",
|
|
||||||
- "d5d7110274cba7cdee90e1a8b0d394c376a5573db6be0bf2747f530",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "112233445566778899",
|
|
||||||
- "61f077c6f62ed802dad7c2f38f5c67f2cc453601e61bd076bb46179e",
|
|
||||||
- "2272f9e9f5933e70388ee652513443b5e289dd135dcc0d0299b225e4",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "112233445566778899112233445566778899",
|
|
||||||
- "29895f0af496bfc62b6ef8d8a65c88c613949b03668aab4f0429e35",
|
|
||||||
- "3ea6e53f9a841f2019ec24bde1a75677aa9b5902e61081c01064de93",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "6950511619965839450988900688150712778015737983940691968051900319680",
|
|
||||||
- "ab689930bcae4a4aa5f5cb085e823e8ae30fd365eb1da4aba9cf0379",
|
|
||||||
- "3345a121bbd233548af0d210654eb40bab788a03666419be6fbd34e7",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13479972933410060327035789020509431695094902435494295338570602119423",
|
|
||||||
- "bdb6a8817c1f89da1c2f3dd8e97feb4494f2ed302a4ce2bc7f5f4025",
|
|
||||||
- "4c7020d57c00411889462d77a5438bb4e97d177700bf7243a07f1680",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13479971751745682581351455311314208093898607229429740618390390702079",
|
|
||||||
- "d58b61aa41c32dd5eba462647dba75c5d67c83606c0af2bd928446a9",
|
|
||||||
- "d24ba6a837be0460dd107ae77725696d211446c5609b4595976b16bd",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13479972931865328106486971546324465392952975980343228160962702868479",
|
|
||||||
- "dc9fa77978a005510980e929a1485f63716df695d7a0c18bb518df03",
|
|
||||||
- "ede2b016f2ddffc2a8c015b134928275ce09e5661b7ab14ce0d1d403",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "11795773708834916026404142434151065506931607341523388140225443265536",
|
|
||||||
- "499d8b2829cfb879c901f7d85d357045edab55028824d0f05ba279ba",
|
|
||||||
- "bf929537b06e4015919639d94f57838fa33fc3d952598dcdbb44d638",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "784254593043826236572847595991346435467177662189391577090",
|
|
||||||
- "8246c999137186632c5f9eddf3b1b0e1764c5e8bd0e0d8a554b9cb77",
|
|
||||||
- "e80ed8660bc1cb17ac7d845be40a7a022d3306f116ae9f81fea65947",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13479767645505654746623887797783387853576174193480695826442858012671",
|
|
||||||
- "6670c20afcceaea672c97f75e2e9dd5c8460e54bb38538ebb4bd30eb",
|
|
||||||
- "f280d8008d07a4caf54271f993527d46ff3ff46fd1190a3f1faa4f74",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "205688069665150753842126177372015544874550518966168735589597183",
|
|
||||||
- "eca934247425cfd949b795cb5ce1eff401550386e28d1a4c5a8eb",
|
|
||||||
- "d4c01040dba19628931bc8855370317c722cbd9ca6156985f1c2e9ce",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "13479966930919337728895168462090683249159702977113823384618282123295",
|
|
||||||
- "ef353bf5c73cd551b96d596fbc9a67f16d61dd9fe56af19de1fba9cd",
|
|
||||||
- "21771b9cdce3e8430c09b3838be70b48c21e15bc09ee1f2d7945b91f",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "50210731791415612487756441341851895584393717453129007497216",
|
|
||||||
- "4036052a3091eb481046ad3289c95d3ac905ca0023de2c03ecd451cf",
|
|
||||||
- "d768165a38a2b96f812586a9d59d4136035d9c853a5bf2e1c86a4993",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368041",
|
|
||||||
- "fcc7f2b45df1cd5a3c0c0731ca47a8af75cfb0347e8354eefe782455",
|
|
||||||
- "f2a28eefd8b345832116f1e574f2c6b2c895aa8c24941f40d8b80ad1",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368042",
|
|
||||||
- "a1e81c04f30ce201c7c9ace785ed44cc33b455a022f2acdbc6cae83c",
|
|
||||||
- "230e093c24f638f533dac6e2b6d01da3b5e7f45429315ca93fb8e634",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368043",
|
|
||||||
- "c9ff61b040874c0568479216824a15eab1a838a797d189746226e4cc",
|
|
||||||
- "156729f1a003647030666054e208180f8f7b0df2249e44fba5931fff",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368044",
|
|
||||||
- "b8357c3a6ceef288310e17b8bfeff9200846ca8c1942497c484403bc",
|
|
||||||
- "eb610599f95942df1082e4f9426d086fb9c6231ae8b24933aab5db",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368045",
|
|
||||||
- "b6ec4fe1777382404ef679997ba8d1cc5cd8e85349259f590c4c66d",
|
|
||||||
- "cc662b9bcba6f94ee4ff1c9c10bd6ddd0d138df2d099a282152a4b7f",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368046",
|
|
||||||
- "baa4d8635511a7d288aebeedd12ce529ff102c91f97f867e21916bf9",
|
|
||||||
- "6865a0b8a607f0b04b13d1cb0aa992a5a97f5ee8ca1849efb9ed8678",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368047",
|
|
||||||
- "a53640c83dc208603ded83e4ecf758f24c357d7cf48088b2ce01e9fa",
|
|
||||||
- "2a7eb328dbe663b5a468b5bc97a040a3745396ba636b964370dc3352",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368048",
|
|
||||||
- "34e8e17a430e43289793c383fac9774247b40e9ebd3366981fcfaeca",
|
|
||||||
- "dad7e608e380480434ea641cc82c82cbc92801469c8db0204f13489a",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368049",
|
|
||||||
- "6e31ee1dc137f81b056752e4deab1443a481033e9b4c93a3044f4f7a",
|
|
||||||
- "df82220fc7a4021549165325725f94c3410ddb56c54e161fc9ef62ee",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368050",
|
|
||||||
- "ef53b6294aca431f0f3c22dc82eb9050324f1d88d377e716448e507c",
|
|
||||||
- "df4aefffbf6d1699c930481cd102127c9a3d992048ab05929b6e5927",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368051",
|
|
||||||
- "aea9e17a306517eb89152aa7096d2c381ec813c51aa880e7bee2c0fd",
|
|
||||||
- "c644cf154cc81f5ade49345e541b4d4b5c1adb3eb5c01c14ee949aa2",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368052",
|
|
||||||
- "2fdcccfee720a77ef6cb3bfbb447f9383117e3daa4a07e36ed15f78d",
|
|
||||||
- "c8e8cd1b0be40b0877cfca1958603122f1e6914f84b7e8e968ae8b9e",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368053",
|
|
||||||
- "858e6f9cc6c12c31f5df124aa77767b05c8bc021bd683d2b55571550",
|
|
||||||
- "fb9232c15a3bc7673a3a03b0253824c53d0fd1411b1cabe2e187fb87",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368054",
|
|
||||||
- "db2f6be630e246a5cf7d99b85194b123d487e2d466b94b24a03c3e28",
|
|
||||||
- "f0c5cff7ab680d09ee11dae84e9c1072ac48ea2e744b1b7f72fd469e",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368055",
|
|
||||||
- "1f2483f82572251fca975fea40db821df8ad82a3c002ee6c57112408",
|
|
||||||
- "76050f3348af2664aac3a8b05281304ebc7a7914c6ad50a4b4eac383",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368056",
|
|
||||||
- "31c49ae75bce7807cdff22055d94ee9021fedbb5ab51c57526f011aa",
|
|
||||||
- "d817400e8ba9ca13a45f360e3d121eaaeb39af82d6001c8186f5f866",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368057",
|
|
||||||
- "ae99feebb5d26945b54892092a8aee02912930fa41cd114e40447301",
|
|
||||||
- "fb7da7f5f13a43b81774373c879cd32d6934c05fa758eeb14fcfab38",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368058",
|
|
||||||
- "df1b1d66a551d0d31eff822558b9d2cc75c2180279fe0d08fd896d04",
|
|
||||||
- "5c080fc3522f41bbb3f55a97cfecf21f882ce8cbb1e50ca6e67e56dc",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368059",
|
|
||||||
- "706a46dc76dcb76798e60e6d89474788d16dc18032d268fd1a704fa6",
|
|
||||||
- "e3d4895843da188fd58fb0567976d7b50359d6b78530c8f62d1b1746",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
- "26959946667150639794667015087019625940457807714424391721682722368060",
|
|
||||||
- "b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
|
|
||||||
- "42c89c774a08dc04b3dd201932bc8a5ea5f8b89bbb2a7e667aff81cd",
|
|
||||||
- },
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-func TestBaseMult(t *testing.T) {
|
-func TestBaseMult(t *testing.T) {
|
||||||
- p224 := P224()
|
- p224 := P224()
|
||||||
- for i, e := range p224BaseMultTests {
|
- for i, e := range p224BaseMultTests {
|
||||||
@ -355,8 +97,27 @@
|
|||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
-
|
-
|
||||||
func TestInfinity(t *testing.T) {
|
func TestP256BaseMult(t *testing.T) {
|
||||||
tests := []struct {
|
p256 := P256()
|
||||||
|
p256Generic := p256.Params()
|
||||||
|
|
||||||
|
- scalars := make([]*big.Int, 0, len(p224BaseMultTests)+1)
|
||||||
|
- for _, e := range p224BaseMultTests {
|
||||||
|
+ scalars := make([]*big.Int, 0, len(p256BaseMultTests)+1)
|
||||||
|
+ for _, e := range p256BaseMultTests {
|
||||||
|
k, _ := new(big.Int).SetString(e.k, 10)
|
||||||
|
scalars = append(scalars, k)
|
||||||
|
}
|
||||||
|
@@ -352,7 +307,7 @@ func TestP256Mult(t *testing.T) {
|
||||||
|
p256 := P256()
|
||||||
|
p256Generic := p256.Params()
|
||||||
|
|
||||||
|
- for i, e := range p224BaseMultTests {
|
||||||
|
+ for i, e := range p256BaseMultTests {
|
||||||
|
x, _ := new(big.Int).SetString(e.x, 16)
|
||||||
|
y, _ := new(big.Int).SetString(e.y, 16)
|
||||||
|
k, _ := new(big.Int).SetString(e.k, 10)
|
||||||
|
@@ -373,7 +328,6 @@ func TestInfinity(t *testing.T) {
|
||||||
name string
|
name string
|
||||||
curve Curve
|
curve Curve
|
||||||
}{
|
}{
|
||||||
@ -364,11 +125,10 @@
|
|||||||
{"p256", P256()},
|
{"p256", P256()},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,43 +44,3 @@ func TestInfinity(t *testing.T) {
|
@@ -406,53 +360,13 @@ func TestInfinity(t *testing.T) {
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-
|
|
||||||
-func BenchmarkBaseMult(b *testing.B) {
|
-func BenchmarkBaseMult(b *testing.B) {
|
||||||
- b.ResetTimer()
|
- b.ResetTimer()
|
||||||
- p224 := P224()
|
- p224 := P224()
|
||||||
@ -379,6 +139,18 @@
|
|||||||
- p224.ScalarBaseMult(k.Bytes())
|
- p224.ScalarBaseMult(k.Bytes())
|
||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
|
-
|
||||||
|
func BenchmarkBaseMultP256(b *testing.B) {
|
||||||
|
b.ResetTimer()
|
||||||
|
p256 := P256()
|
||||||
|
- e := p224BaseMultTests[25]
|
||||||
|
+ e := p256BaseMultTests[25]
|
||||||
|
k, _ := new(big.Int).SetString(e.k, 10)
|
||||||
|
b.StartTimer()
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
p256.ScalarBaseMult(k.Bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
-
|
-
|
||||||
-func TestMarshal(t *testing.T) {
|
-func TestMarshal(t *testing.T) {
|
||||||
- p224 := P224()
|
- p224 := P224()
|
||||||
@ -408,8 +180,8 @@
|
|||||||
- t.Error("P224 failed to validate a correct point")
|
- t.Error("P224 failed to validate a correct point")
|
||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
--- libgo/go/crypto/ecdsa/ecdsa_test.go.jj 2012-12-13 11:32:02.589039782 +0100
|
--- libgo/go/crypto/ecdsa/ecdsa_test.go.jj 2012-11-15 18:26:56.000000000 +0100
|
||||||
+++ libgo/go/crypto/ecdsa/ecdsa_test.go 2014-02-18 17:28:22.909692022 +0100
|
+++ libgo/go/crypto/ecdsa/ecdsa_test.go 2014-03-05 15:26:38.461442929 +0100
|
||||||
@@ -33,7 +33,6 @@ func testKeyGeneration(t *testing.T, c e
|
@@ -33,7 +33,6 @@ func testKeyGeneration(t *testing.T, c e
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -435,9 +207,9 @@
|
|||||||
case "P-256":
|
case "P-256":
|
||||||
pub.Curve = elliptic.P256()
|
pub.Curve = elliptic.P256()
|
||||||
case "P-384":
|
case "P-384":
|
||||||
--- libgo/go/crypto/x509/x509.go.jj 2013-08-14 13:55:08.939843607 +0200
|
--- libgo/go/crypto/x509/x509.go.jj 2013-11-07 11:59:09.000000000 +0100
|
||||||
+++ libgo/go/crypto/x509/x509.go 2014-02-18 17:28:22.943691764 +0100
|
+++ libgo/go/crypto/x509/x509.go 2014-03-05 15:27:37.022439437 +0100
|
||||||
@@ -283,9 +283,6 @@ func getPublicKeyAlgorithmFromOID(oid as
|
@@ -305,9 +305,6 @@ func getPublicKeyAlgorithmFromOID(oid as
|
||||||
|
|
||||||
// RFC 5480, 2.1.1.1. Named Curve
|
// RFC 5480, 2.1.1.1. Named Curve
|
||||||
//
|
//
|
||||||
@ -447,7 +219,7 @@
|
|||||||
// secp256r1 OBJECT IDENTIFIER ::= {
|
// secp256r1 OBJECT IDENTIFIER ::= {
|
||||||
// iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
|
// iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
|
||||||
// prime(1) 7 }
|
// prime(1) 7 }
|
||||||
@@ -298,7 +295,6 @@ func getPublicKeyAlgorithmFromOID(oid as
|
@@ -320,7 +317,6 @@ func getPublicKeyAlgorithmFromOID(oid as
|
||||||
//
|
//
|
||||||
// NB: secp256r1 is equivalent to prime256v1
|
// NB: secp256r1 is equivalent to prime256v1
|
||||||
var (
|
var (
|
||||||
@ -455,7 +227,7 @@
|
|||||||
oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
|
oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
|
||||||
oidNamedCurveP384 = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
|
oidNamedCurveP384 = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
|
||||||
oidNamedCurveP521 = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
|
oidNamedCurveP521 = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
|
||||||
@@ -306,8 +302,6 @@ var (
|
@@ -328,8 +324,6 @@ var (
|
||||||
|
|
||||||
func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
|
func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
|
||||||
switch {
|
switch {
|
||||||
@ -464,7 +236,7 @@
|
|||||||
case oid.Equal(oidNamedCurveP256):
|
case oid.Equal(oidNamedCurveP256):
|
||||||
return elliptic.P256()
|
return elliptic.P256()
|
||||||
case oid.Equal(oidNamedCurveP384):
|
case oid.Equal(oidNamedCurveP384):
|
||||||
@@ -320,8 +314,6 @@ func namedCurveFromOID(oid asn1.ObjectId
|
@@ -342,8 +336,6 @@ func namedCurveFromOID(oid asn1.ObjectId
|
||||||
|
|
||||||
func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
|
func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
|
||||||
switch curve {
|
switch curve {
|
||||||
@ -473,7 +245,7 @@
|
|||||||
case elliptic.P256():
|
case elliptic.P256():
|
||||||
return oidNamedCurveP256, true
|
return oidNamedCurveP256, true
|
||||||
case elliptic.P384():
|
case elliptic.P384():
|
||||||
@@ -1212,7 +1204,7 @@ func CreateCertificate(rand io.Reader, t
|
@@ -1373,7 +1365,7 @@ func CreateCertificate(rand io.Reader, t
|
||||||
hashFunc = crypto.SHA1
|
hashFunc = crypto.SHA1
|
||||||
case *ecdsa.PrivateKey:
|
case *ecdsa.PrivateKey:
|
||||||
switch priv.Curve {
|
switch priv.Curve {
|
||||||
@ -482,8 +254,8 @@
|
|||||||
hashFunc = crypto.SHA256
|
hashFunc = crypto.SHA256
|
||||||
signatureAlgorithm.Algorithm = oidSignatureECDSAWithSHA256
|
signatureAlgorithm.Algorithm = oidSignatureECDSAWithSHA256
|
||||||
case elliptic.P384():
|
case elliptic.P384():
|
||||||
--- libgo/go/crypto/elliptic/p224.go.jj 2012-12-13 11:32:02.641039533 +0100
|
--- libgo/go/crypto/elliptic/p224.go.jj 2012-11-15 18:26:57.000000000 +0100
|
||||||
+++ libgo/go/crypto/elliptic/p224.go 2014-02-15 11:40:56.191557928 +0100
|
+++ libgo/go/crypto/elliptic/p224.go 2014-03-05 15:30:01.189430842 +0100
|
||||||
@@ -1,765 +0,0 @@
|
@@ -1,765 +0,0 @@
|
||||||
-// Copyright 2012 The Go Authors. All rights reserved.
|
-// Copyright 2012 The Go Authors. All rights reserved.
|
||||||
-// Use of this source code is governed by a BSD-style
|
-// Use of this source code is governed by a BSD-style
|
||||||
@ -1250,8 +1022,8 @@
|
|||||||
-
|
-
|
||||||
- return new(big.Int).SetBytes(buf[:])
|
- return new(big.Int).SetBytes(buf[:])
|
||||||
-}
|
-}
|
||||||
--- libgo/go/crypto/elliptic/p224_test.go.jj 2014-02-18 18:03:31.615598561 +0100
|
--- libgo/go/crypto/elliptic/p224_test.go.jj 2012-11-15 18:26:57.000000000 +0100
|
||||||
+++ libgo/go/crypto/elliptic/p224_test.go 2014-02-15 11:40:56.191557928 +0100
|
+++ libgo/go/crypto/elliptic/p224_test.go 2014-03-05 15:29:58.743430988 +0100
|
||||||
@@ -1,47 +0,0 @@
|
@@ -1,47 +0,0 @@
|
||||||
-// Copyright 2012 The Go Authors. All rights reserved.
|
-// Copyright 2012 The Go Authors. All rights reserved.
|
||||||
-// Use of this source code is governed by a BSD-style
|
-// Use of this source code is governed by a BSD-style
|
||||||
@ -1300,3 +1072,22 @@
|
|||||||
- }
|
- }
|
||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
|
--- libgo/go/crypto/elliptic/p256.go.jj 2013-11-07 11:59:09.000000000 +0100
|
||||||
|
+++ libgo/go/crypto/elliptic/p256.go 2014-03-05 15:34:31.910414701 +0100
|
||||||
|
@@ -233,6 +233,8 @@ func p256ReduceCarry(inout *[p256Limbs]u
|
||||||
|
inout[7] += carry << 25
|
||||||
|
}
|
||||||
|
|
||||||
|
+const bottom28Bits = 0xfffffff
|
||||||
|
+
|
||||||
|
// p256Sum sets out = in+in2.
|
||||||
|
//
|
||||||
|
// On entry, in[i]+in2[i] must not overflow a 32-bit word.
|
||||||
|
@@ -265,6 +267,7 @@ const (
|
||||||
|
two31m2 = 1<<31 - 1<<2
|
||||||
|
two31p24m2 = 1<<31 + 1<<24 - 1<<2
|
||||||
|
two30m27m2 = 1<<30 - 1<<27 - 1<<2
|
||||||
|
+ two31m3 = 1<<31 - 1<<3
|
||||||
|
)
|
||||||
|
|
||||||
|
// p256Zero31 is 0 mod p.
|
||||||
@ -4,7 +4,7 @@
|
|||||||
<a class="link" href="http://www.fsf.org/" target="_top">FSF
|
<a class="link" href="http://www.fsf.org/" target="_top">FSF
|
||||||
</a>
|
</a>
|
||||||
</p><p>
|
</p><p>
|
||||||
+ Release 4.8.1
|
+ Release 4.9.0
|
||||||
+ </p><p>
|
+ </p><p>
|
||||||
Permission is granted to copy, distribute and/or modify this
|
Permission is granted to copy, distribute and/or modify this
|
||||||
document under the terms of the GNU Free Documentation
|
document under the terms of the GNU Free Documentation
|
||||||
@ -18,7 +18,7 @@
|
|||||||
- The API documentation, rendered into HTML, can be viewed online:
|
- The API documentation, rendered into HTML, can be viewed online:
|
||||||
+ The API documentation, rendered into HTML, can be viewed here:
|
+ The API documentation, rendered into HTML, can be viewed here:
|
||||||
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
|
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
|
||||||
+ <a class="link" href="api/index.html" target="_top">for the 4.8.1 release, local
|
+ <a class="link" href="api/index.html" target="_top">for the 4.9.0 release, local
|
||||||
+ </a>
|
+ </a>
|
||||||
+ </p></li><li class="listitem"><p>
|
+ </p></li><li class="listitem"><p>
|
||||||
<a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-3.4/index.html" target="_top">for the 3.4 release
|
<a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-3.4/index.html" target="_top">for the 3.4 release
|
||||||
@ -8,9 +8,9 @@
|
|||||||
|
|
||||||
--- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100
|
--- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100
|
||||||
+++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100
|
+++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100
|
||||||
@@ -18325,18 +18325,22 @@ rs6000_return_addr (int count, rtx frame
|
@@ -20970,18 +20970,22 @@ rs6000_return_addr (int count, rtx frame
|
||||||
don't try to be too clever here. */
|
if (count != 0
|
||||||
if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic))
|
|| ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_DARWIN) && flag_pic))
|
||||||
{
|
{
|
||||||
+ rtx x;
|
+ rtx x;
|
||||||
cfun->machine->ra_needs_full_frame = 1;
|
cfun->machine->ra_needs_full_frame = 1;
|
||||||
@ -1,17 +1,17 @@
|
|||||||
--- gcc/config.gcc.jj 2008-04-24 15:42:46.000000000 -0500
|
--- gcc/config.gcc.jj 2008-04-24 15:42:46.000000000 -0500
|
||||||
+++ gcc/config.gcc 2008-04-24 15:44:51.000000000 -0500
|
+++ gcc/config.gcc 2008-04-24 15:44:51.000000000 -0500
|
||||||
@@ -2421,7 +2421,7 @@ sparc-*-rtems*)
|
@@ -2656,7 +2656,7 @@ sparc-*-rtems*)
|
||||||
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
|
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
|
||||||
tmake_file="sparc/t-sparc sparc/t-elf sparc/t-rtems t-rtems"
|
tmake_file="${tmake_file} sparc/t-sparc sparc/t-elf sparc/t-rtems"
|
||||||
;;
|
;;
|
||||||
-sparc-*-linux*)
|
-sparc-*-linux*)
|
||||||
+sparc-*-linux* | sparcv9-*-linux*)
|
+sparc-*-linux* | sparcv9-*-linux*)
|
||||||
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
|
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
|
||||||
extra_options="${extra_options} sparc/long-double-switch.opt"
|
extra_options="${extra_options} sparc/long-double-switch.opt"
|
||||||
case ${target} in
|
case ${target} in
|
||||||
@@ -2474,7 +2474,7 @@ sparc64-*-rtems*)
|
@@ -2710,7 +2710,7 @@ sparc64-*-rtems*)
|
||||||
extra_options="${extra_options}"
|
extra_options="${extra_options}"
|
||||||
tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64 t-rtems"
|
tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64"
|
||||||
;;
|
;;
|
||||||
-sparc64-*-linux*)
|
-sparc64-*-linux*)
|
||||||
+sparc64*-*-linux*)
|
+sparc64*-*-linux*)
|
||||||
@ -1,392 +0,0 @@
|
|||||||
--- isl-0.11.1/config.guess
|
|
||||||
+++ isl-0.11.1/config.guess
|
|
||||||
@@ -2,9 +2,9 @@
|
|
||||||
# Attempt to guess a canonical system name.
|
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
||||||
-# 2011 Free Software Foundation, Inc.
|
|
||||||
+# 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
-timestamp='2011-05-11'
|
|
||||||
+timestamp='2012-06-10'
|
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License as published by
|
|
||||||
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
-# along with this program; if not, write to the Free Software
|
|
||||||
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
||||||
-# 02110-1301, USA.
|
|
||||||
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
|
|
||||||
|
|
||||||
Originally written by Per Bothner.
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
||||||
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
|
|
||||||
-Software Foundation, Inc.
|
|
||||||
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
|
||||||
+Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
||||||
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
|
||||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
||||||
*:NetBSD:*:*)
|
|
||||||
# NetBSD (nbsd) targets should (where applicable) match one or
|
|
||||||
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
||||||
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
||||||
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
|
|
||||||
# switched to ELF, *-*-netbsd* would select the old
|
|
||||||
# object file format. This provides both forward
|
|
||||||
@@ -792,13 +790,12 @@ EOF
|
|
||||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
*:FreeBSD:*:*)
|
|
||||||
- case ${UNAME_MACHINE} in
|
|
||||||
- pc98)
|
|
||||||
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
|
|
||||||
+ case ${UNAME_PROCESSOR} in
|
|
||||||
amd64)
|
|
||||||
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
*)
|
|
||||||
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
esac
|
|
||||||
exit ;;
|
|
||||||
i*:CYGWIN*:*)
|
|
||||||
@@ -807,6 +804,9 @@ EOF
|
|
||||||
*:MINGW*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
|
||||||
exit ;;
|
|
||||||
+ i*:MSYS*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-pc-msys
|
|
||||||
+ exit ;;
|
|
||||||
i*:windows32*:*)
|
|
||||||
# uname -m includes "-pc" on this system.
|
|
||||||
echo ${UNAME_MACHINE}-mingw32
|
|
||||||
@@ -861,6 +861,13 @@ EOF
|
|
||||||
i*86:Minix:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-minix
|
|
||||||
exit ;;
|
|
||||||
+ aarch64:Linux:*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
+ exit ;;
|
|
||||||
+ aarch64_be:Linux:*:*)
|
|
||||||
+ UNAME_MACHINE=aarch64_be
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
+ exit ;;
|
|
||||||
alpha:Linux:*:*)
|
|
||||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
||||||
EV5) UNAME_MACHINE=alphaev5 ;;
|
|
||||||
@@ -895,13 +902,16 @@ EOF
|
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
cris:Linux:*:*)
|
|
||||||
- echo cris-axis-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
crisv32:Linux:*:*)
|
|
||||||
- echo crisv32-axis-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
frv:Linux:*:*)
|
|
||||||
- echo frv-unknown-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
+ exit ;;
|
|
||||||
+ hexagon:Linux:*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
i*86:Linux:*:*)
|
|
||||||
LIBC=gnu
|
|
||||||
@@ -943,7 +953,7 @@ EOF
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
||||||
;;
|
|
||||||
or32:Linux:*:*)
|
|
||||||
- echo or32-unknown-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
padre:Linux:*:*)
|
|
||||||
echo sparc-unknown-linux-gnu
|
|
||||||
@@ -978,13 +988,13 @@ EOF
|
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
tile*:Linux:*:*)
|
|
||||||
- echo ${UNAME_MACHINE}-tilera-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
vax:Linux:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
x86_64:Linux:*:*)
|
|
||||||
- echo x86_64-unknown-linux-gnu
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
xtensa*:Linux:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
@@ -1246,7 +1256,7 @@ EOF
|
|
||||||
NEO-?:NONSTOP_KERNEL:*:*)
|
|
||||||
echo neo-tandem-nsk${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
- NSE-?:NONSTOP_KERNEL:*:*)
|
|
||||||
+ NSE-*:NONSTOP_KERNEL:*:*)
|
|
||||||
echo nse-tandem-nsk${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
NSR-?:NONSTOP_KERNEL:*:*)
|
|
||||||
@@ -1315,6 +1325,9 @@ EOF
|
|
||||||
i*86:AROS:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-aros
|
|
||||||
exit ;;
|
|
||||||
+ x86_64:VMkernel:*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-esx
|
|
||||||
+ exit ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
||||||
--- isl-0.11.1/config.sub
|
|
||||||
+++ isl-0.11.1/config.sub
|
|
||||||
@@ -2,9 +2,9 @@
|
|
||||||
# Configuration validation subroutine script.
|
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
||||||
-# 2011 Free Software Foundation, Inc.
|
|
||||||
+# 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
-timestamp='2011-03-23'
|
|
||||||
+timestamp='2012-04-18'
|
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
|
||||||
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
-# along with this program; if not, write to the Free Software
|
|
||||||
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
||||||
-# 02110-1301, USA.
|
|
||||||
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
@@ -76,8 +74,8 @@ version="\
|
|
||||||
GNU config.sub ($timestamp)
|
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
||||||
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
|
|
||||||
-Software Foundation, Inc.
|
|
||||||
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
|
||||||
+Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
||||||
@@ -132,6 +130,10 @@ case $maybe_os in
|
|
||||||
os=-$maybe_os
|
|
||||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
|
||||||
;;
|
|
||||||
+ android-linux)
|
|
||||||
+ os=-linux-android
|
|
||||||
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
|
||||||
if [ $basic_machine != $1 ]
|
|
||||||
@@ -223,6 +225,12 @@ case $os in
|
|
||||||
-isc*)
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
+ -lynx*178)
|
|
||||||
+ os=-lynxos178
|
|
||||||
+ ;;
|
|
||||||
+ -lynx*5)
|
|
||||||
+ os=-lynxos5
|
|
||||||
+ ;;
|
|
||||||
-lynx*)
|
|
||||||
os=-lynxos
|
|
||||||
;;
|
|
||||||
@@ -247,17 +255,22 @@ case $basic_machine in
|
|
||||||
# Some are omitted here because they have special meanings below.
|
|
||||||
1750a | 580 \
|
|
||||||
| a29k \
|
|
||||||
+ | aarch64 | aarch64_be \
|
|
||||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
|
||||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
|
||||||
| am33_2.0 \
|
|
||||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
|
||||||
+ | be32 | be64 \
|
|
||||||
| bfin \
|
|
||||||
| c4x | clipper \
|
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
|
||||||
+ | epiphany \
|
|
||||||
| fido | fr30 | frv \
|
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
|
||||||
+ | hexagon \
|
|
||||||
| i370 | i860 | i960 | ia64 \
|
|
||||||
| ip2k | iq2000 \
|
|
||||||
+ | le32 | le64 \
|
|
||||||
| lm32 \
|
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
|
||||||
| maxq | mb | microblaze | mcore | mep | metag \
|
|
||||||
@@ -291,7 +304,7 @@ case $basic_machine in
|
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle \
|
|
||||||
| pyramid \
|
|
||||||
- | rx \
|
|
||||||
+ | rl78 | rx \
|
|
||||||
| score \
|
|
||||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
||||||
| sh64 | sh64le \
|
|
||||||
@@ -300,7 +313,7 @@ case $basic_machine in
|
|
||||||
| spu \
|
|
||||||
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
|
|
||||||
| ubicom32 \
|
|
||||||
- | v850 | v850e \
|
|
||||||
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
|
||||||
| we32k \
|
|
||||||
| x86 | xc16x | xstormy16 | xtensa \
|
|
||||||
| z8k | z80)
|
|
||||||
@@ -315,8 +328,7 @@ case $basic_machine in
|
|
||||||
c6x)
|
|
||||||
basic_machine=tic6x-unknown
|
|
||||||
;;
|
|
||||||
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
|
||||||
- # Motorola 68HC11/12.
|
|
||||||
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
|
||||||
basic_machine=$basic_machine-unknown
|
|
||||||
os=-none
|
|
||||||
;;
|
|
||||||
@@ -329,7 +341,10 @@ case $basic_machine in
|
|
||||||
strongarm | thumb | xscale)
|
|
||||||
basic_machine=arm-unknown
|
|
||||||
;;
|
|
||||||
-
|
|
||||||
+ xgate)
|
|
||||||
+ basic_machine=$basic_machine-unknown
|
|
||||||
+ os=-none
|
|
||||||
+ ;;
|
|
||||||
xscaleeb)
|
|
||||||
basic_machine=armeb-unknown
|
|
||||||
;;
|
|
||||||
@@ -352,11 +367,13 @@ case $basic_machine in
|
|
||||||
# Recognize the basic CPU types with company name.
|
|
||||||
580-* \
|
|
||||||
| a29k-* \
|
|
||||||
+ | aarch64-* | aarch64_be-* \
|
|
||||||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
|
||||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
|
||||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
|
||||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
|
||||||
| avr-* | avr32-* \
|
|
||||||
+ | be32-* | be64-* \
|
|
||||||
| bfin-* | bs2000-* \
|
|
||||||
| c[123]* | c30-* | [cjt]90-* | c4x-* \
|
|
||||||
| clipper-* | craynv-* | cydra-* \
|
|
||||||
@@ -365,8 +382,10 @@ case $basic_machine in
|
|
||||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
|
||||||
| h8300-* | h8500-* \
|
|
||||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
|
||||||
+ | hexagon-* \
|
|
||||||
| i*86-* | i860-* | i960-* | ia64-* \
|
|
||||||
| ip2k-* | iq2000-* \
|
|
||||||
+ | le32-* | le64-* \
|
|
||||||
| lm32-* \
|
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
||||||
@@ -400,7 +419,7 @@ case $basic_machine in
|
|
||||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
|
||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
|
|
||||||
| pyramid-* \
|
|
||||||
- | romp-* | rs6000-* | rx-* \
|
|
||||||
+ | rl78-* | romp-* | rs6000-* | rx-* \
|
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
|
||||||
@@ -408,10 +427,11 @@ case $basic_machine in
|
|
||||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
|
|
||||||
| tahoe-* \
|
|
||||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
|
||||||
- | tile-* | tilegx-* \
|
|
||||||
+ | tile*-* \
|
|
||||||
| tron-* \
|
|
||||||
| ubicom32-* \
|
|
||||||
- | v850-* | v850e-* | vax-* \
|
|
||||||
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
|
|
||||||
+ | vax-* \
|
|
||||||
| we32k-* \
|
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* \
|
|
||||||
| xstormy16-* | xtensa*-* \
|
|
||||||
@@ -711,7 +731,6 @@ case $basic_machine in
|
|
||||||
i370-ibm* | ibm*)
|
|
||||||
basic_machine=i370-ibm
|
|
||||||
;;
|
|
||||||
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
|
||||||
i*86v32)
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
|
||||||
os=-sysv32
|
|
||||||
@@ -808,10 +827,18 @@ case $basic_machine in
|
|
||||||
ms1-*)
|
|
||||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
|
||||||
;;
|
|
||||||
+ msys)
|
|
||||||
+ basic_machine=i386-pc
|
|
||||||
+ os=-msys
|
|
||||||
+ ;;
|
|
||||||
mvs)
|
|
||||||
basic_machine=i370-ibm
|
|
||||||
os=-mvs
|
|
||||||
;;
|
|
||||||
+ nacl)
|
|
||||||
+ basic_machine=le32-unknown
|
|
||||||
+ os=-nacl
|
|
||||||
+ ;;
|
|
||||||
ncr3000)
|
|
||||||
basic_machine=i486-ncr
|
|
||||||
os=-sysv4
|
|
||||||
@@ -1120,13 +1147,8 @@ case $basic_machine in
|
|
||||||
basic_machine=t90-cray
|
|
||||||
os=-unicos
|
|
||||||
;;
|
|
||||||
- # This must be matched before tile*.
|
|
||||||
- tilegx*)
|
|
||||||
- basic_machine=tilegx-unknown
|
|
||||||
- os=-linux-gnu
|
|
||||||
- ;;
|
|
||||||
tile*)
|
|
||||||
- basic_machine=tile-unknown
|
|
||||||
+ basic_machine=$basic_machine-unknown
|
|
||||||
os=-linux-gnu
|
|
||||||
;;
|
|
||||||
tx39)
|
|
||||||
@@ -1336,7 +1358,7 @@ case $os in
|
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
||||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
|
||||||
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
||||||
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
||||||
| -mingw32* | -linux-gnu* | -linux-android* \
|
|
||||||
| -linux-newlib* | -linux-uclibc* \
|
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
||||||
@@ -1521,6 +1543,9 @@ case $basic_machine in
|
|
||||||
c4x-* | tic4x-*)
|
|
||||||
os=-coff
|
|
||||||
;;
|
|
||||||
+ hexagon-*)
|
|
||||||
+ os=-elf
|
|
||||||
+ ;;
|
|
||||||
tic54x-*)
|
|
||||||
os=-coff
|
|
||||||
;;
|
|
||||||
@@ -1548,9 +1573,6 @@ case $basic_machine in
|
|
||||||
;;
|
|
||||||
m68000-sun)
|
|
||||||
os=-sunos3
|
|
||||||
- # This also exists in the configure program, but was not the
|
|
||||||
- # default.
|
|
||||||
- # os=-sunos4
|
|
||||||
;;
|
|
||||||
m68*-cisco)
|
|
||||||
os=-aout
|
|
||||||
6
sources
6
sources
@ -1,4 +1,4 @@
|
|||||||
be78a47bd82523250eb3e91646db5b3d cloog-0.18.0.tar.gz
|
e34fca0540d840e5d0f6427e98c92252 cloog-0.18.1.tar.gz
|
||||||
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
|
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
|
||||||
9f699b42394bd2754d9f77427553d923 gcc-4.8.2-20140120.tar.bz2
|
0234f026f694bc5837a5abb890f045a6 gcc-4.9.0-20140409.tar.bz2
|
||||||
bce1586384d8635a76d2f017fb067cd2 isl-0.11.1.tar.bz2
|
e039bfcfb6c2ab039b8ee69bf883e824 isl-0.12.2.tar.bz2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user