add support for GCC 4.7-linaro (based on GCC 4.7.1)
SVN-Revision: 31392
This commit is contained in:
Mirko Vogt
parent
87cdc0dd5b
commit
84307e4035
19 changed files with 10373 additions and 1 deletions
|
|
@ -23,6 +23,9 @@ choice
|
||||||
config GCC_VERSION_4_6_LINARO
|
config GCC_VERSION_4_6_LINARO
|
||||||
bool "gcc 4.6.x with Linaro enhancements"
|
bool "gcc 4.6.x with Linaro enhancements"
|
||||||
|
|
||||||
|
config GCC_VERSION_4_7_LINARO
|
||||||
|
bool "gcc 4.7.x with Linaro enhancements"
|
||||||
|
|
||||||
config GCC_VERSION_LLVM
|
config GCC_VERSION_LLVM
|
||||||
bool "llvm-gcc 4.2"
|
bool "llvm-gcc 4.2"
|
||||||
depends BROKEN
|
depends BROKEN
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ config GCC_VERSION
|
||||||
default "4.7.0" if GCC_VERSION_4_7_0
|
default "4.7.0" if GCC_VERSION_4_7_0
|
||||||
default "4.5-linaro" if GCC_VERSION_4_5_LINARO
|
default "4.5-linaro" if GCC_VERSION_4_5_LINARO
|
||||||
default "4.6-linaro" if GCC_VERSION_4_6_LINARO
|
default "4.6-linaro" if GCC_VERSION_4_6_LINARO
|
||||||
|
default "4.7-linaro" if GCC_VERSION_4_7_LINARO
|
||||||
default "llvm" if GCC_VERSION_LLVM
|
default "llvm" if GCC_VERSION_LLVM
|
||||||
default "4.6-linaro"
|
default "4.6-linaro"
|
||||||
|
|
||||||
|
|
@ -35,7 +36,7 @@ config GCC_VERSION_4_6
|
||||||
|
|
||||||
config GCC_VERSION_4_7
|
config GCC_VERSION_4_7
|
||||||
bool
|
bool
|
||||||
default y if GCC_VERSION_4_7_0
|
default y if (GCC_VERSION_4_7_0 || GCC_VERSION_4_7_LINARO)
|
||||||
|
|
||||||
if !TOOLCHAINOPTS
|
if !TOOLCHAINOPTS
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,12 @@ ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
|
||||||
PKG_VERSION_MAJOR:=4.6
|
PKG_VERSION_MAJOR:=4.6
|
||||||
PKG_MD5SUM:=2b7887846f8e5ac1ca58fe4dfaabf5a6
|
PKG_MD5SUM:=2b7887846f8e5ac1ca58fe4dfaabf5a6
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(CONFIG_GCC_VERSION),"4.7-linaro")
|
||||||
|
PKG_REV:=4.7-2012.04
|
||||||
|
PKG_VERSION:=4.7.1
|
||||||
|
PKG_VERSION_MAJOR:=4.7
|
||||||
|
PKG_MD5SUM:=6dab459c1177fc9ae2969e7a39549d44
|
||||||
|
endif
|
||||||
PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/
|
PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/
|
||||||
PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2
|
||||||
GCC_DIR:=gcc-linaro-$(PKG_REV)
|
GCC_DIR:=gcc-linaro-$(PKG_REV)
|
||||||
|
|
|
||||||
239
toolchain/gcc/patches/4.7-linaro/000-upstream_uclibc_fix.patch
Normal file
239
toolchain/gcc/patches/4.7-linaro/000-upstream_uclibc_fix.patch
Normal file
|
|
@ -0,0 +1,239 @@
|
||||||
|
--- a/gcc/tree-ssa-tail-merge.c
|
||||||
|
+++ b/gcc/tree-ssa-tail-merge.c
|
||||||
|
@@ -1033,7 +1033,7 @@ set_cluster (basic_block bb1, basic_bloc
|
||||||
|
gimple_bb (s2) are members of SAME_SUCC. */
|
||||||
|
|
||||||
|
static bool
|
||||||
|
-gimple_equal_p (same_succ same_succ, gimple s1, gimple s2)
|
||||||
|
+gimple_equal_p (same_succ same_succ, gimple s1, gimple s2, bool *gvn_used)
|
||||||
|
{
|
||||||
|
unsigned int i;
|
||||||
|
tree lhs1, lhs2;
|
||||||
|
@@ -1069,7 +1069,10 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
if (operand_equal_p (t1, t2, 0))
|
||||||
|
continue;
|
||||||
|
if (gvn_uses_equal (t1, t2))
|
||||||
|
- continue;
|
||||||
|
+ {
|
||||||
|
+ *gvn_used = true;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
equal = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
@@ -1083,12 +1086,16 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
if (lhs1 == NULL_TREE || lhs2 == NULL_TREE)
|
||||||
|
return false;
|
||||||
|
if (TREE_CODE (lhs1) == SSA_NAME && TREE_CODE (lhs2) == SSA_NAME)
|
||||||
|
- return vn_valueize (lhs1) == vn_valueize (lhs2);
|
||||||
|
+ {
|
||||||
|
+ *gvn_used = true;
|
||||||
|
+ return vn_valueize (lhs1) == vn_valueize (lhs2);
|
||||||
|
+ }
|
||||||
|
return operand_equal_p (lhs1, lhs2, 0);
|
||||||
|
|
||||||
|
case GIMPLE_ASSIGN:
|
||||||
|
lhs1 = gimple_get_lhs (s1);
|
||||||
|
lhs2 = gimple_get_lhs (s2);
|
||||||
|
+ *gvn_used = true;
|
||||||
|
return (TREE_CODE (lhs1) == SSA_NAME
|
||||||
|
&& TREE_CODE (lhs2) == SSA_NAME
|
||||||
|
&& vn_valueize (lhs1) == vn_valueize (lhs2));
|
||||||
|
@@ -1096,15 +1103,23 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
case GIMPLE_COND:
|
||||||
|
t1 = gimple_cond_lhs (s1);
|
||||||
|
t2 = gimple_cond_lhs (s2);
|
||||||
|
- if (!operand_equal_p (t1, t2, 0)
|
||||||
|
- && !gvn_uses_equal (t1, t2))
|
||||||
|
- return false;
|
||||||
|
+ if (!operand_equal_p (t1, t2, 0))
|
||||||
|
+ {
|
||||||
|
+ if (gvn_uses_equal (t1, t2))
|
||||||
|
+ *gvn_used = true;
|
||||||
|
+ else
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
t1 = gimple_cond_rhs (s1);
|
||||||
|
t2 = gimple_cond_rhs (s2);
|
||||||
|
- if (!operand_equal_p (t1, t2, 0)
|
||||||
|
- && !gvn_uses_equal (t1, t2))
|
||||||
|
- return false;
|
||||||
|
+ if (!operand_equal_p (t1, t2, 0))
|
||||||
|
+ {
|
||||||
|
+ if (gvn_uses_equal (t1, t2))
|
||||||
|
+ *gvn_used = true;
|
||||||
|
+ else
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
code1 = gimple_expr_code (s1);
|
||||||
|
code2 = gimple_expr_code (s2);
|
||||||
|
@@ -1126,18 +1141,25 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
/* Let GSI skip backwards over local defs. */
|
||||||
|
|
||||||
|
static void
|
||||||
|
-gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi)
|
||||||
|
+gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi, tree *vuse)
|
||||||
|
{
|
||||||
|
gimple stmt;
|
||||||
|
+ tree lvuse;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (gsi_end_p (*gsi))
|
||||||
|
return;
|
||||||
|
stmt = gsi_stmt (*gsi);
|
||||||
|
+
|
||||||
|
+ lvuse = gimple_vuse (stmt);
|
||||||
|
+ if (lvuse != NULL_TREE)
|
||||||
|
+ *vuse = lvuse;
|
||||||
|
+
|
||||||
|
if (!(is_gimple_assign (stmt) && local_def (gimple_get_lhs (stmt))
|
||||||
|
&& !gimple_has_side_effects (stmt)))
|
||||||
|
return;
|
||||||
|
+
|
||||||
|
gsi_prev_nondebug (gsi);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1146,28 +1168,34 @@ gsi_advance_bw_nondebug_nonlocal (gimple
|
||||||
|
clusters them. */
|
||||||
|
|
||||||
|
static void
|
||||||
|
-find_duplicate (same_succ same_succ, basic_block bb1, basic_block bb2)
|
||||||
|
+find_duplicate (same_succ same_succ, basic_block bb1, basic_block bb2,
|
||||||
|
+ bool gvn_used)
|
||||||
|
{
|
||||||
|
gimple_stmt_iterator gsi1 = gsi_last_nondebug_bb (bb1);
|
||||||
|
gimple_stmt_iterator gsi2 = gsi_last_nondebug_bb (bb2);
|
||||||
|
+ tree vuse1 = NULL_TREE, vuse2 = NULL_TREE;
|
||||||
|
|
||||||
|
- gsi_advance_bw_nondebug_nonlocal (&gsi1);
|
||||||
|
- gsi_advance_bw_nondebug_nonlocal (&gsi2);
|
||||||
|
+ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1);
|
||||||
|
+ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2);
|
||||||
|
|
||||||
|
while (!gsi_end_p (gsi1) && !gsi_end_p (gsi2))
|
||||||
|
{
|
||||||
|
- if (!gimple_equal_p (same_succ, gsi_stmt (gsi1), gsi_stmt (gsi2)))
|
||||||
|
+ if (!gimple_equal_p (same_succ, gsi_stmt (gsi1), gsi_stmt (gsi2),
|
||||||
|
+ &gvn_used))
|
||||||
|
return;
|
||||||
|
|
||||||
|
gsi_prev_nondebug (&gsi1);
|
||||||
|
gsi_prev_nondebug (&gsi2);
|
||||||
|
- gsi_advance_bw_nondebug_nonlocal (&gsi1);
|
||||||
|
- gsi_advance_bw_nondebug_nonlocal (&gsi2);
|
||||||
|
+ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1);
|
||||||
|
+ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(gsi_end_p (gsi1) && gsi_end_p (gsi2)))
|
||||||
|
return;
|
||||||
|
|
||||||
|
+ if (gvn_used && vuse1 != vuse2)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
if (dump_file)
|
||||||
|
fprintf (dump_file, "find_duplicates: <bb %d> duplicate of <bb %d>\n",
|
||||||
|
bb1->index, bb2->index);
|
||||||
|
@@ -1179,7 +1207,7 @@ find_duplicate (same_succ same_succ, bas
|
||||||
|
E2 are equal. */
|
||||||
|
|
||||||
|
static bool
|
||||||
|
-same_phi_alternatives_1 (basic_block dest, edge e1, edge e2)
|
||||||
|
+same_phi_alternatives_1 (basic_block dest, edge e1, edge e2, bool *gvn_used)
|
||||||
|
{
|
||||||
|
int n1 = e1->dest_idx, n2 = e2->dest_idx;
|
||||||
|
gimple_stmt_iterator gsi;
|
||||||
|
@@ -1197,7 +1225,10 @@ same_phi_alternatives_1 (basic_block des
|
||||||
|
if (operand_equal_for_phi_arg_p (val1, val2))
|
||||||
|
continue;
|
||||||
|
if (gvn_uses_equal (val1, val2))
|
||||||
|
- continue;
|
||||||
|
+ {
|
||||||
|
+ *gvn_used = true;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@@ -1209,7 +1240,8 @@ same_phi_alternatives_1 (basic_block des
|
||||||
|
phi alternatives for BB1 and BB2 are equal. */
|
||||||
|
|
||||||
|
static bool
|
||||||
|
-same_phi_alternatives (same_succ same_succ, basic_block bb1, basic_block bb2)
|
||||||
|
+same_phi_alternatives (same_succ same_succ, basic_block bb1, basic_block bb2,
|
||||||
|
+ bool *gvn_used)
|
||||||
|
{
|
||||||
|
unsigned int s;
|
||||||
|
bitmap_iterator bs;
|
||||||
|
@@ -1227,7 +1259,7 @@ same_phi_alternatives (same_succ same_su
|
||||||
|
|
||||||
|
/* For all phis in bb, the phi alternatives for e1 and e2 need to have
|
||||||
|
the same value. */
|
||||||
|
- if (!same_phi_alternatives_1 (succ, e1, e2))
|
||||||
|
+ if (!same_phi_alternatives_1 (succ, e1, e2, gvn_used))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1301,6 +1333,7 @@ find_clusters_1 (same_succ same_succ)
|
||||||
|
bitmap_iterator bi, bj;
|
||||||
|
int nr_comparisons;
|
||||||
|
int max_comparisons = PARAM_VALUE (PARAM_MAX_TAIL_MERGE_COMPARISONS);
|
||||||
|
+ bool gvn_used;
|
||||||
|
|
||||||
|
EXECUTE_IF_SET_IN_BITMAP (same_succ->bbs, 0, i, bi)
|
||||||
|
{
|
||||||
|
@@ -1333,10 +1366,11 @@ find_clusters_1 (same_succ same_succ)
|
||||||
|
if (!deps_ok_for_redirect (bb1, bb2))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
- if (!(same_phi_alternatives (same_succ, bb1, bb2)))
|
||||||
|
+ gvn_used = false;
|
||||||
|
+ if (!(same_phi_alternatives (same_succ, bb1, bb2, &gvn_used)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
- find_duplicate (same_succ, bb1, bb2);
|
||||||
|
+ find_duplicate (same_succ, bb1, bb2, gvn_used);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/testsuite/gcc.dg/pr52734.c
|
||||||
|
@@ -0,0 +1,35 @@
|
||||||
|
+/* { dg-do run } */
|
||||||
|
+/* { dg-options "-O2" } */
|
||||||
|
+
|
||||||
|
+int bbb = 0;
|
||||||
|
+
|
||||||
|
+int __attribute__((noinline,noclone)) aaa(void)
|
||||||
|
+{
|
||||||
|
+ ++bbb;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int __attribute__((noinline,noclone)) ccc(void)
|
||||||
|
+{
|
||||||
|
+ int ddd;
|
||||||
|
+ /* bbb == 0 */
|
||||||
|
+ if (aaa())
|
||||||
|
+ return bbb;
|
||||||
|
+
|
||||||
|
+ /* bbb == 1 */
|
||||||
|
+ ddd = bbb;
|
||||||
|
+ /* bbb == ddd == 1 */
|
||||||
|
+ if (aaa ())
|
||||||
|
+ return 0;
|
||||||
|
+ /* bbb == 2, ddd == 1 */
|
||||||
|
+
|
||||||
|
+ return ddd;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int main(void)
|
||||||
|
+{
|
||||||
|
+ if (ccc() != 1)
|
||||||
|
+ __builtin_abort();
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
33
toolchain/gcc/patches/4.7-linaro/100-uclibc-conf.patch
Normal file
33
toolchain/gcc/patches/4.7-linaro/100-uclibc-conf.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
--- a/contrib/regression/objs-gcc.sh
|
||||||
|
+++ b/contrib/regression/objs-gcc.sh
|
||||||
|
@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
|
||||||
|
then
|
||||||
|
make all-gdb all-dejagnu all-ld || exit 1
|
||||||
|
make install-gdb install-dejagnu install-ld || exit 1
|
||||||
|
+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
|
||||||
|
+ then
|
||||||
|
+ make all-gdb all-dejagnu all-ld || exit 1
|
||||||
|
+ make install-gdb install-dejagnu install-ld || exit 1
|
||||||
|
elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
|
||||||
|
make bootstrap || exit 1
|
||||||
|
make install || exit 1
|
||||||
|
--- a/libjava/classpath/ltconfig
|
||||||
|
+++ b/libjava/classpath/ltconfig
|
||||||
|
@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
|
||||||
|
|
||||||
|
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
||||||
|
case $host_os in
|
||||||
|
-linux-gnu*) ;;
|
||||||
|
+linux-gnu*|linux-uclibc*) ;;
|
||||||
|
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
|
||||||
|
esac
|
||||||
|
|
||||||
|
@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
|
||||||
|
;;
|
||||||
|
|
||||||
|
# This must be Linux ELF.
|
||||||
|
-linux-gnu*)
|
||||||
|
+linux*)
|
||||||
|
version_type=linux
|
||||||
|
need_lib_prefix=no
|
||||||
|
need_version=no
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/boehm-gc/include/gc.h
|
||||||
|
+++ b/boehm-gc/include/gc.h
|
||||||
|
@@ -503,7 +503,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of
|
||||||
|
#if defined(__linux__) || defined(__GLIBC__)
|
||||||
|
# include <features.h>
|
||||||
|
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
|
||||||
|
- && !defined(__ia64__)
|
||||||
|
+ && !defined(__ia64__) && !defined(__UCLIBC__)
|
||||||
|
# ifndef GC_HAVE_BUILTIN_BACKTRACE
|
||||||
|
# define GC_HAVE_BUILTIN_BACKTRACE
|
||||||
|
# endif
|
||||||
11
toolchain/gcc/patches/4.7-linaro/302-c99-snprintf.patch
Normal file
11
toolchain/gcc/patches/4.7-linaro/302-c99-snprintf.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/libstdc++-v3/include/c_global/cstdio
|
||||||
|
+++ b/libstdc++-v3/include/c_global/cstdio
|
||||||
|
@@ -140,7 +140,7 @@ namespace std
|
||||||
|
using ::vsprintf;
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
-#if _GLIBCXX_USE_C99
|
||||||
|
+#if _GLIBCXX_USE_C99 || defined __UCLIBC__
|
||||||
|
|
||||||
|
#undef snprintf
|
||||||
|
#undef vfscanf
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
--- a/libmudflap/mf-hooks2.c
|
||||||
|
+++ b/libmudflap/mf-hooks2.c
|
||||||
|
@@ -424,7 +424,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
|
||||||
|
{
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
|
||||||
|
- bzero (s, n);
|
||||||
|
+ memset (s, 0, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -434,7 +434,7 @@ WRAPPER2(void, bcopy, const void *src, v
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
|
||||||
|
MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
|
||||||
|
- bcopy (src, dest, n);
|
||||||
|
+ memmove (dest, src, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -444,7 +444,7 @@ WRAPPER2(int, bcmp, const void *s1, cons
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
|
||||||
|
MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
|
||||||
|
- return bcmp (s1, s2, n);
|
||||||
|
+ return n == 0 ? 0 : memcmp (s1, s2, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -453,7 +453,7 @@ WRAPPER2(char *, index, const char *s, i
|
||||||
|
size_t n = strlen (s);
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
|
||||||
|
- return index (s, c);
|
||||||
|
+ return strchr (s, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -462,7 +462,7 @@ WRAPPER2(char *, rindex, const char *s,
|
||||||
|
size_t n = strlen (s);
|
||||||
|
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
||||||
|
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
|
||||||
|
- return rindex (s, c);
|
||||||
|
+ return strrchr (s, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* XXX: stpcpy, memccpy */
|
||||||
|
|
@ -0,0 +1,247 @@
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/make/target/gcc/4.7.0/920-tree-ssa-tail-merge.patch
|
||||||
|
@@ -0,0 +1,244 @@
|
||||||
|
+This patch refers to:
|
||||||
|
+
|
||||||
|
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52734
|
||||||
|
+http://gcc.gnu.org/bugzilla/attachment.cgi?id=27014&action=diff&context=patch&collapsed=&headers=1&format=raw
|
||||||
|
+
|
||||||
|
+--- gcc/tree-ssa-tail-merge.c
|
||||||
|
++++ gcc/tree-ssa-tail-merge.c
|
||||||
|
+@@ -1033,7 +1033,7 @@ set_cluster (basic_block bb1, basic_bloc
|
||||||
|
+ gimple_bb (s2) are members of SAME_SUCC. */
|
||||||
|
+
|
||||||
|
+ static bool
|
||||||
|
+-gimple_equal_p (same_succ same_succ, gimple s1, gimple s2)
|
||||||
|
++gimple_equal_p (same_succ same_succ, gimple s1, gimple s2, bool *gvn_used)
|
||||||
|
+ {
|
||||||
|
+ unsigned int i;
|
||||||
|
+ tree lhs1, lhs2;
|
||||||
|
+@@ -1069,7 +1069,10 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
+ if (operand_equal_p (t1, t2, 0))
|
||||||
|
+ continue;
|
||||||
|
+ if (gvn_uses_equal (t1, t2))
|
||||||
|
+- continue;
|
||||||
|
++ {
|
||||||
|
++ *gvn_used = true;
|
||||||
|
++ continue;
|
||||||
|
++ }
|
||||||
|
+ equal = false;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+@@ -1083,12 +1086,16 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
+ if (lhs1 == NULL_TREE || lhs2 == NULL_TREE)
|
||||||
|
+ return false;
|
||||||
|
+ if (TREE_CODE (lhs1) == SSA_NAME && TREE_CODE (lhs2) == SSA_NAME)
|
||||||
|
+- return vn_valueize (lhs1) == vn_valueize (lhs2);
|
||||||
|
++ {
|
||||||
|
++ *gvn_used = true;
|
||||||
|
++ return vn_valueize (lhs1) == vn_valueize (lhs2);
|
||||||
|
++ }
|
||||||
|
+ return operand_equal_p (lhs1, lhs2, 0);
|
||||||
|
+
|
||||||
|
+ case GIMPLE_ASSIGN:
|
||||||
|
+ lhs1 = gimple_get_lhs (s1);
|
||||||
|
+ lhs2 = gimple_get_lhs (s2);
|
||||||
|
++ *gvn_used = true;
|
||||||
|
+ return (TREE_CODE (lhs1) == SSA_NAME
|
||||||
|
+ && TREE_CODE (lhs2) == SSA_NAME
|
||||||
|
+ && vn_valueize (lhs1) == vn_valueize (lhs2));
|
||||||
|
+@@ -1096,15 +1103,23 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
+ case GIMPLE_COND:
|
||||||
|
+ t1 = gimple_cond_lhs (s1);
|
||||||
|
+ t2 = gimple_cond_lhs (s2);
|
||||||
|
+- if (!operand_equal_p (t1, t2, 0)
|
||||||
|
+- && !gvn_uses_equal (t1, t2))
|
||||||
|
+- return false;
|
||||||
|
++ if (!operand_equal_p (t1, t2, 0))
|
||||||
|
++ {
|
||||||
|
++ if (gvn_uses_equal (t1, t2))
|
||||||
|
++ *gvn_used = true;
|
||||||
|
++ else
|
||||||
|
++ return false;
|
||||||
|
++ }
|
||||||
|
+
|
||||||
|
+ t1 = gimple_cond_rhs (s1);
|
||||||
|
+ t2 = gimple_cond_rhs (s2);
|
||||||
|
+- if (!operand_equal_p (t1, t2, 0)
|
||||||
|
+- && !gvn_uses_equal (t1, t2))
|
||||||
|
+- return false;
|
||||||
|
++ if (!operand_equal_p (t1, t2, 0))
|
||||||
|
++ {
|
||||||
|
++ if (gvn_uses_equal (t1, t2))
|
||||||
|
++ *gvn_used = true;
|
||||||
|
++ else
|
||||||
|
++ return false;
|
||||||
|
++ }
|
||||||
|
+
|
||||||
|
+ code1 = gimple_expr_code (s1);
|
||||||
|
+ code2 = gimple_expr_code (s2);
|
||||||
|
+@@ -1126,18 +1141,25 @@ gimple_equal_p (same_succ same_succ, gim
|
||||||
|
+ /* Let GSI skip backwards over local defs. */
|
||||||
|
+
|
||||||
|
+ static void
|
||||||
|
+-gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi)
|
||||||
|
++gsi_advance_bw_nondebug_nonlocal (gimple_stmt_iterator *gsi, tree *vuse)
|
||||||
|
+ {
|
||||||
|
+ gimple stmt;
|
||||||
|
++ tree lvuse;
|
||||||
|
+
|
||||||
|
+ while (true)
|
||||||
|
+ {
|
||||||
|
+ if (gsi_end_p (*gsi))
|
||||||
|
+ return;
|
||||||
|
+ stmt = gsi_stmt (*gsi);
|
||||||
|
++
|
||||||
|
++ lvuse = gimple_vuse (stmt);
|
||||||
|
++ if (lvuse != NULL_TREE)
|
||||||
|
++ *vuse = lvuse;
|
||||||
|
++
|
||||||
|
+ if (!(is_gimple_assign (stmt) && local_def (gimple_get_lhs (stmt))
|
||||||
|
+ && !gimple_has_side_effects (stmt)))
|
||||||
|
+ return;
|
||||||
|
++
|
||||||
|
+ gsi_prev_nondebug (gsi);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+@@ -1146,28 +1168,34 @@ gsi_advance_bw_nondebug_nonlocal (gimple
|
||||||
|
+ clusters them. */
|
||||||
|
+
|
||||||
|
+ static void
|
||||||
|
+-find_duplicate (same_succ same_succ, basic_block bb1, basic_block bb2)
|
||||||
|
++find_duplicate (same_succ same_succ, basic_block bb1, basic_block bb2,
|
||||||
|
++ bool gvn_used)
|
||||||
|
+ {
|
||||||
|
+ gimple_stmt_iterator gsi1 = gsi_last_nondebug_bb (bb1);
|
||||||
|
+ gimple_stmt_iterator gsi2 = gsi_last_nondebug_bb (bb2);
|
||||||
|
++ tree vuse1 = NULL_TREE, vuse2 = NULL_TREE;
|
||||||
|
+
|
||||||
|
+- gsi_advance_bw_nondebug_nonlocal (&gsi1);
|
||||||
|
+- gsi_advance_bw_nondebug_nonlocal (&gsi2);
|
||||||
|
++ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1);
|
||||||
|
++ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2);
|
||||||
|
+
|
||||||
|
+ while (!gsi_end_p (gsi1) && !gsi_end_p (gsi2))
|
||||||
|
+ {
|
||||||
|
+- if (!gimple_equal_p (same_succ, gsi_stmt (gsi1), gsi_stmt (gsi2)))
|
||||||
|
++ if (!gimple_equal_p (same_succ, gsi_stmt (gsi1), gsi_stmt (gsi2),
|
||||||
|
++ &gvn_used))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ gsi_prev_nondebug (&gsi1);
|
||||||
|
+ gsi_prev_nondebug (&gsi2);
|
||||||
|
+- gsi_advance_bw_nondebug_nonlocal (&gsi1);
|
||||||
|
+- gsi_advance_bw_nondebug_nonlocal (&gsi2);
|
||||||
|
++ gsi_advance_bw_nondebug_nonlocal (&gsi1, &vuse1);
|
||||||
|
++ gsi_advance_bw_nondebug_nonlocal (&gsi2, &vuse2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!(gsi_end_p (gsi1) && gsi_end_p (gsi2)))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
++ if (gvn_used && vuse1 != vuse2)
|
||||||
|
++ return;
|
||||||
|
++
|
||||||
|
+ if (dump_file)
|
||||||
|
+ fprintf (dump_file, "find_duplicates: <bb %d> duplicate of <bb %d>\n",
|
||||||
|
+ bb1->index, bb2->index);
|
||||||
|
+@@ -1179,7 +1207,7 @@ find_duplicate (same_succ same_succ, bas
|
||||||
|
+ E2 are equal. */
|
||||||
|
+
|
||||||
|
+ static bool
|
||||||
|
+-same_phi_alternatives_1 (basic_block dest, edge e1, edge e2)
|
||||||
|
++same_phi_alternatives_1 (basic_block dest, edge e1, edge e2, bool *gvn_used)
|
||||||
|
+ {
|
||||||
|
+ int n1 = e1->dest_idx, n2 = e2->dest_idx;
|
||||||
|
+ gimple_stmt_iterator gsi;
|
||||||
|
+@@ -1197,7 +1225,10 @@ same_phi_alternatives_1 (basic_block des
|
||||||
|
+ if (operand_equal_for_phi_arg_p (val1, val2))
|
||||||
|
+ continue;
|
||||||
|
+ if (gvn_uses_equal (val1, val2))
|
||||||
|
+- continue;
|
||||||
|
++ {
|
||||||
|
++ *gvn_used = true;
|
||||||
|
++ continue;
|
||||||
|
++ }
|
||||||
|
+
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+@@ -1209,7 +1240,8 @@ same_phi_alternatives_1 (basic_block des
|
||||||
|
+ phi alternatives for BB1 and BB2 are equal. */
|
||||||
|
+
|
||||||
|
+ static bool
|
||||||
|
+-same_phi_alternatives (same_succ same_succ, basic_block bb1, basic_block bb2)
|
||||||
|
++same_phi_alternatives (same_succ same_succ, basic_block bb1, basic_block bb2,
|
||||||
|
++ bool *gvn_used)
|
||||||
|
+ {
|
||||||
|
+ unsigned int s;
|
||||||
|
+ bitmap_iterator bs;
|
||||||
|
+@@ -1227,7 +1259,7 @@ same_phi_alternatives (same_succ same_su
|
||||||
|
+
|
||||||
|
+ /* For all phis in bb, the phi alternatives for e1 and e2 need to have
|
||||||
|
+ the same value. */
|
||||||
|
+- if (!same_phi_alternatives_1 (succ, e1, e2))
|
||||||
|
++ if (!same_phi_alternatives_1 (succ, e1, e2, gvn_used))
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+@@ -1301,6 +1333,7 @@ find_clusters_1 (same_succ same_succ)
|
||||||
|
+ bitmap_iterator bi, bj;
|
||||||
|
+ int nr_comparisons;
|
||||||
|
+ int max_comparisons = PARAM_VALUE (PARAM_MAX_TAIL_MERGE_COMPARISONS);
|
||||||
|
++ bool gvn_used;
|
||||||
|
+
|
||||||
|
+ EXECUTE_IF_SET_IN_BITMAP (same_succ->bbs, 0, i, bi)
|
||||||
|
+ {
|
||||||
|
+@@ -1333,10 +1366,11 @@ find_clusters_1 (same_succ same_succ)
|
||||||
|
+ if (!deps_ok_for_redirect (bb1, bb2))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+- if (!(same_phi_alternatives (same_succ, bb1, bb2)))
|
||||||
|
++ gvn_used = false;
|
||||||
|
++ if (!(same_phi_alternatives (same_succ, bb1, bb2, &gvn_used)))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+- find_duplicate (same_succ, bb1, bb2);
|
||||||
|
++ find_duplicate (same_succ, bb1, bb2, gvn_used);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+--- gcc/testsuite/gcc.dg/pr52734.c
|
||||||
|
++++ gcc/testsuite/gcc.dg/pr52734.c
|
||||||
|
+@@ -0,0 +1,35 @@
|
||||||
|
++/* { dg-do run } */
|
||||||
|
++/* { dg-options "-O2" } */
|
||||||
|
++
|
||||||
|
++int bbb = 0;
|
||||||
|
++
|
||||||
|
++int __attribute__((noinline,noclone)) aaa(void)
|
||||||
|
++{
|
||||||
|
++ ++bbb;
|
||||||
|
++ return 0;
|
||||||
|
++}
|
||||||
|
++
|
||||||
|
++int __attribute__((noinline,noclone)) ccc(void)
|
||||||
|
++{
|
||||||
|
++ int ddd;
|
||||||
|
++ /* bbb == 0 */
|
||||||
|
++ if (aaa())
|
||||||
|
++ return bbb;
|
||||||
|
++
|
||||||
|
++ /* bbb == 1 */
|
||||||
|
++ ddd = bbb;
|
||||||
|
++ /* bbb == ddd == 1 */
|
||||||
|
++ if (aaa ())
|
||||||
|
++ return 0;
|
||||||
|
++ /* bbb == 2, ddd == 1 */
|
||||||
|
++
|
||||||
|
++ return ddd;
|
||||||
|
++}
|
||||||
|
++
|
||||||
|
++int main(void)
|
||||||
|
++{
|
||||||
|
++ if (ccc() != 1)
|
||||||
|
++ __builtin_abort();
|
||||||
|
++ return 0;
|
||||||
|
++}
|
||||||
|
++
|
||||||
9368
toolchain/gcc/patches/4.7-linaro/600-ubicom_support.patch
Normal file
9368
toolchain/gcc/patches/4.7-linaro/600-ubicom_support.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,25 @@
|
||||||
|
--- a/gcc/config/arm/linux-elf.h
|
||||||
|
+++ b/gcc/config/arm/linux-elf.h
|
||||||
|
@@ -57,7 +57,7 @@
|
||||||
|
%{shared:-lc} \
|
||||||
|
%{!shared:%{profile:-lc_p}%{!profile:-lc}}"
|
||||||
|
|
||||||
|
-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
|
||||||
|
+#define LIBGCC_SPEC "-lgcc"
|
||||||
|
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||||||
|
|
||||||
|
--- a/libgcc/config/arm/t-linux
|
||||||
|
+++ b/libgcc/config/arm/t-linux
|
||||||
|
@@ -1,6 +1,10 @@
|
||||||
|
LIB1ASMSRC = arm/lib1funcs.S
|
||||||
|
LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
|
||||||
|
- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3
|
||||||
|
+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
|
||||||
|
+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
|
||||||
|
+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
|
||||||
|
+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
|
||||||
|
+ _arm_fixsfsi _arm_fixunssfsi
|
||||||
|
|
||||||
|
# Just for these, we omit the frame pointer since it makes such a big
|
||||||
|
# difference.
|
||||||
36
toolchain/gcc/patches/4.7-linaro/820-libgcc_pic.patch
Normal file
36
toolchain/gcc/patches/4.7-linaro/820-libgcc_pic.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
--- a/libgcc/Makefile.in
|
||||||
|
+++ b/libgcc/Makefile.in
|
||||||
|
@@ -862,11 +862,12 @@ $(libgcov-objects): %$(objext): $(srcdir
|
||||||
|
|
||||||
|
# Static libraries.
|
||||||
|
libgcc.a: $(libgcc-objects)
|
||||||
|
+libgcc_pic.a: $(libgcc-s-objects)
|
||||||
|
libgcov.a: $(libgcov-objects)
|
||||||
|
libunwind.a: $(libunwind-objects)
|
||||||
|
libgcc_eh.a: $(libgcc-eh-objects)
|
||||||
|
|
||||||
|
-libgcc.a libgcov.a libunwind.a libgcc_eh.a:
|
||||||
|
+libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a:
|
||||||
|
-rm -f $@
|
||||||
|
|
||||||
|
objects="$(objects)"; \
|
||||||
|
@@ -888,7 +889,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(enable_shared),yes)
|
||||||
|
-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
|
||||||
|
+all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT)
|
||||||
|
ifneq ($(LIBUNWIND),)
|
||||||
|
all: libunwind$(SHLIB_EXT)
|
||||||
|
endif
|
||||||
|
@@ -1043,6 +1044,10 @@ install-shared:
|
||||||
|
chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
|
||||||
|
$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
|
||||||
|
|
||||||
|
+ $(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/
|
||||||
|
+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a
|
||||||
|
+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a
|
||||||
|
+
|
||||||
|
$(subst @multilib_dir@,$(MULTIDIR),$(subst \
|
||||||
|
@shlib_base_name@,libgcc_s,$(subst \
|
||||||
|
@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
|
||||||
|
|
||||||
|
--- a/gcc/config/arm/linux-eabi.h
|
||||||
|
+++ b/gcc/config/arm/linux-eabi.h
|
||||||
|
@@ -45,7 +45,7 @@
|
||||||
|
The ARM10TDMI core is the default for armv5t, so set
|
||||||
|
SUBTARGET_CPU_DEFAULT to achieve this. */
|
||||||
|
#undef SUBTARGET_CPU_DEFAULT
|
||||||
|
-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
|
||||||
|
+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
|
||||||
|
|
||||||
|
/* TARGET_BIG_ENDIAN_DEFAULT is set in
|
||||||
|
config.gcc for big endian configurations. */
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
--- a/gcc/config/arm/linux-eabi.h
|
||||||
|
+++ b/gcc/config/arm/linux-eabi.h
|
||||||
|
@@ -64,10 +64,15 @@
|
||||||
|
#undef GLIBC_DYNAMIC_LINKER
|
||||||
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
|
||||||
|
|
||||||
|
+/* For armv4 we pass --fix-v4bx to linker to support EABI */
|
||||||
|
+#undef TARGET_FIX_V4BX_SPEC
|
||||||
|
+#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\
|
||||||
|
+ "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}"
|
||||||
|
+
|
||||||
|
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
||||||
|
use the GNU/Linux version, not the generic BPABI version. */
|
||||||
|
#undef LINK_SPEC
|
||||||
|
-#define LINK_SPEC BE8_LINK_SPEC \
|
||||||
|
+#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC \
|
||||||
|
LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \
|
||||||
|
LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
|
||||||
|
|
||||||
20
toolchain/gcc/patches/4.7-linaro/870-ppc_no_crtsavres.patch
Normal file
20
toolchain/gcc/patches/4.7-linaro/870-ppc_no_crtsavres.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/gcc/config/rs6000/sysv4.h
|
||||||
|
+++ b/gcc/config/rs6000/sysv4.h
|
||||||
|
@@ -246,13 +246,13 @@ do { \
|
||||||
|
|
||||||
|
/* Define cutoff for using external functions to save floating point.
|
||||||
|
When optimizing for size, use external functions when profitable. */
|
||||||
|
-#define FP_SAVE_INLINE(FIRST_REG) (optimize_size \
|
||||||
|
+#define FP_SAVE_INLINE(FIRST_REG) (1 || (optimize_size \
|
||||||
|
? ((FIRST_REG) == 62 \
|
||||||
|
|| (FIRST_REG) == 63) \
|
||||||
|
- : (FIRST_REG) < 64)
|
||||||
|
+ : (FIRST_REG) < 64))
|
||||||
|
/* And similarly for general purpose registers. */
|
||||||
|
-#define GP_SAVE_INLINE(FIRST_REG) ((FIRST_REG) < 32 \
|
||||||
|
- && !optimize_size)
|
||||||
|
+#define GP_SAVE_INLINE(FIRST_REG) (1 || ((FIRST_REG) < 32 \
|
||||||
|
+ && !optimize_size))
|
||||||
|
|
||||||
|
/* Put jump tables in read-only memory, rather than in .text. */
|
||||||
|
#define JUMP_TABLES_IN_TEXT_SECTION 0
|
||||||
253
toolchain/gcc/patches/4.7-linaro/910-mbsd_multi.patch
Normal file
253
toolchain/gcc/patches/4.7-linaro/910-mbsd_multi.patch
Normal file
|
|
@ -0,0 +1,253 @@
|
||||||
|
|
||||||
|
This patch brings over a few features from MirBSD:
|
||||||
|
* -fhonour-copts
|
||||||
|
If this option is not given, it's warned (depending
|
||||||
|
on environment variables). This is to catch errors
|
||||||
|
of misbuilt packages which override CFLAGS themselves.
|
||||||
|
* -Werror-maybe-reset
|
||||||
|
Has the effect of -Wno-error if GCC_NO_WERROR is
|
||||||
|
set and not '0', a no-operation otherwise. This is
|
||||||
|
to be able to use -Werror in "make" but prevent
|
||||||
|
GNU autoconf generated configure scripts from
|
||||||
|
freaking out.
|
||||||
|
* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
|
||||||
|
the default for -O2/-Os, because they trigger gcc bugs
|
||||||
|
and can delete code with security implications.
|
||||||
|
|
||||||
|
This patch was authored by Thorsten Glaser <tg at mirbsd.de>
|
||||||
|
with copyright assignment to the FSF in effect.
|
||||||
|
|
||||||
|
--- a/gcc/c-family/c-opts.c
|
||||||
|
+++ b/gcc/c-family/c-opts.c
|
||||||
|
@@ -108,6 +108,9 @@ static size_t deferred_count;
|
||||||
|
/* Number of deferred options scanned for -include. */
|
||||||
|
static size_t include_cursor;
|
||||||
|
|
||||||
|
+/* Check if a port honours COPTS. */
|
||||||
|
+static int honour_copts = 0;
|
||||||
|
+
|
||||||
|
static void handle_OPT_d (const char *);
|
||||||
|
static void set_std_cxx98 (int);
|
||||||
|
static void set_std_cxx11 (int);
|
||||||
|
@@ -449,6 +452,9 @@ c_common_handle_option (size_t scode, co
|
||||||
|
cpp_opts->warn_endif_labels = value;
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case OPT_Werror_maybe_reset:
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case OPT_Wformat:
|
||||||
|
set_Wformat (value);
|
||||||
|
break;
|
||||||
|
@@ -592,6 +598,12 @@ c_common_handle_option (size_t scode, co
|
||||||
|
flag_no_builtin = !value;
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case OPT_fhonour_copts:
|
||||||
|
+ if (c_language == clk_c) {
|
||||||
|
+ honour_copts++;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case OPT_fconstant_string_class_:
|
||||||
|
constant_string_class_name = arg;
|
||||||
|
break;
|
||||||
|
@@ -1098,6 +1110,47 @@ c_common_init (void)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (c_language == clk_c) {
|
||||||
|
+ char *ev = getenv ("GCC_HONOUR_COPTS");
|
||||||
|
+ int evv;
|
||||||
|
+ if (ev == NULL)
|
||||||
|
+ evv = -1;
|
||||||
|
+ else if ((*ev == '0') || (*ev == '\0'))
|
||||||
|
+ evv = 0;
|
||||||
|
+ else if (*ev == '1')
|
||||||
|
+ evv = 1;
|
||||||
|
+ else if (*ev == '2')
|
||||||
|
+ evv = 2;
|
||||||
|
+ else if (*ev == 's')
|
||||||
|
+ evv = -1;
|
||||||
|
+ else {
|
||||||
|
+ warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
|
||||||
|
+ evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */
|
||||||
|
+ }
|
||||||
|
+ if (evv == 1) {
|
||||||
|
+ if (honour_copts == 0) {
|
||||||
|
+ error ("someone does not honour COPTS at all in lenient mode");
|
||||||
|
+ return false;
|
||||||
|
+ } else if (honour_copts != 1) {
|
||||||
|
+ warning (0, "someone does not honour COPTS correctly, passed %d times",
|
||||||
|
+ honour_copts);
|
||||||
|
+ }
|
||||||
|
+ } else if (evv == 2) {
|
||||||
|
+ if (honour_copts == 0) {
|
||||||
|
+ error ("someone does not honour COPTS at all in strict mode");
|
||||||
|
+ return false;
|
||||||
|
+ } else if (honour_copts != 1) {
|
||||||
|
+ error ("someone does not honour COPTS correctly, passed %d times",
|
||||||
|
+ honour_copts);
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ } else if (evv == 0) {
|
||||||
|
+ if (honour_copts != 1)
|
||||||
|
+ inform (0, "someone does not honour COPTS correctly, passed %d times",
|
||||||
|
+ honour_copts);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- a/gcc/c-family/c.opt
|
||||||
|
+++ b/gcc/c-family/c.opt
|
||||||
|
@@ -371,6 +371,10 @@ Werror-implicit-function-declaration
|
||||||
|
C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
|
||||||
|
This switch is deprecated; use -Werror=implicit-function-declaration instead
|
||||||
|
|
||||||
|
+Werror-maybe-reset
|
||||||
|
+C ObjC C++ ObjC++
|
||||||
|
+; Documented in common.opt
|
||||||
|
+
|
||||||
|
Wfloat-equal
|
||||||
|
C ObjC C++ ObjC++ Var(warn_float_equal) Warning
|
||||||
|
Warn if testing floating point numbers for equality
|
||||||
|
@@ -830,6 +834,9 @@ C++ ObjC++ Optimization Alias(fexception
|
||||||
|
fhonor-std
|
||||||
|
C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
|
||||||
|
|
||||||
|
+fhonour-copts
|
||||||
|
+C ObjC C++ ObjC++ RejectNegative
|
||||||
|
+
|
||||||
|
fhosted
|
||||||
|
C ObjC
|
||||||
|
Assume normal C execution environment
|
||||||
|
--- a/gcc/common.opt
|
||||||
|
+++ b/gcc/common.opt
|
||||||
|
@@ -531,6 +531,10 @@ Werror=
|
||||||
|
Common Joined
|
||||||
|
Treat specified warning as error
|
||||||
|
|
||||||
|
+Werror-maybe-reset
|
||||||
|
+Common
|
||||||
|
+If environment variable GCC_NO_WERROR is set, act as -Wno-error
|
||||||
|
+
|
||||||
|
Wextra
|
||||||
|
Common Var(extra_warnings) Warning
|
||||||
|
Print extra (possibly unwanted) warnings
|
||||||
|
@@ -1209,6 +1213,9 @@ fguess-branch-probability
|
||||||
|
Common Report Var(flag_guess_branch_prob) Optimization
|
||||||
|
Enable guessing of branch probabilities
|
||||||
|
|
||||||
|
+fhonour-copts
|
||||||
|
+Common RejectNegative
|
||||||
|
+
|
||||||
|
; Nonzero means ignore `#ident' directives. 0 means handle them.
|
||||||
|
; Generate position-independent code for executables if possible
|
||||||
|
; On SVR4 targets, it also controls whether or not to emit a
|
||||||
|
--- a/gcc/opts.c
|
||||||
|
+++ b/gcc/opts.c
|
||||||
|
@@ -470,8 +470,6 @@ static const struct default_options defa
|
||||||
|
{ OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
|
||||||
|
#endif
|
||||||
|
{ OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
|
||||||
|
- { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
|
||||||
|
- { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
|
||||||
|
{ OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
|
||||||
|
{ OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
|
||||||
|
{ OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
|
||||||
|
@@ -489,6 +487,8 @@ static const struct default_options defa
|
||||||
|
{ OPT_LEVELS_2_PLUS_SPEED_ONLY, OPT_foptimize_strlen, NULL, 1 },
|
||||||
|
|
||||||
|
/* -O3 optimizations. */
|
||||||
|
+ { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
|
||||||
|
+ { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
|
||||||
|
{ OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
|
||||||
|
{ OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
|
||||||
|
/* Inlining of functions reducing size is a good idea with -Os
|
||||||
|
@@ -1432,6 +1432,17 @@ common_handle_option (struct gcc_options
|
||||||
|
opts, opts_set, loc, dc);
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case OPT_Werror_maybe_reset:
|
||||||
|
+ {
|
||||||
|
+ char *ev = getenv ("GCC_NO_WERROR");
|
||||||
|
+ if ((ev != NULL) && (*ev != '0'))
|
||||||
|
+ warnings_are_errors = 0;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case OPT_fhonour_copts:
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case OPT_Wlarger_than_:
|
||||||
|
opts->x_larger_than_size = value;
|
||||||
|
opts->x_warn_larger_than = value != -1;
|
||||||
|
--- a/gcc/doc/cppopts.texi
|
||||||
|
+++ b/gcc/doc/cppopts.texi
|
||||||
|
@@ -164,6 +164,11 @@ in older programs. This warning is on b
|
||||||
|
Make all warnings into hard errors. Source code which triggers warnings
|
||||||
|
will be rejected.
|
||||||
|
|
||||||
|
+ at item -Werror-maybe-reset
|
||||||
|
+ at opindex Werror-maybe-reset
|
||||||
|
+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
|
||||||
|
+variable is set to anything other than 0 or empty.
|
||||||
|
+
|
||||||
|
@item -Wsystem-headers
|
||||||
|
@opindex Wsystem-headers
|
||||||
|
Issue warnings for code in system headers. These are normally unhelpful
|
||||||
|
--- a/gcc/doc/invoke.texi
|
||||||
|
+++ b/gcc/doc/invoke.texi
|
||||||
|
@@ -242,7 +242,7 @@ Objective-C and Objective-C++ Dialects}.
|
||||||
|
-Wconversion -Wcoverage-mismatch -Wno-cpp -Wno-deprecated @gol
|
||||||
|
-Wno-deprecated-declarations -Wdisabled-optimization @gol
|
||||||
|
-Wno-div-by-zero -Wdouble-promotion -Wempty-body -Wenum-compare @gol
|
||||||
|
--Wno-endif-labels -Werror -Werror=* @gol
|
||||||
|
+-Wno-endif-labels -Werror -Werror=* -Werror-maybe-reset @gol
|
||||||
|
-Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol
|
||||||
|
-Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
|
||||||
|
-Wformat-security -Wformat-y2k @gol
|
||||||
|
@@ -4649,6 +4649,22 @@ This option is only supported for C and
|
||||||
|
@option{-Wall} and by @option{-pedantic}, which can be disabled with
|
||||||
|
@option{-Wno-pointer-sign}.
|
||||||
|
|
||||||
|
+ at item -Werror-maybe-reset
|
||||||
|
+ at opindex Werror-maybe-reset
|
||||||
|
+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
|
||||||
|
+variable is set to anything other than 0 or empty.
|
||||||
|
+
|
||||||
|
+ at item -fhonour-copts
|
||||||
|
+ at opindex fhonour-copts
|
||||||
|
+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
|
||||||
|
+given at least once, and warn if it is given more than once.
|
||||||
|
+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
|
||||||
|
+given exactly once.
|
||||||
|
+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
|
||||||
|
+is not given exactly once.
|
||||||
|
+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
|
||||||
|
+This flag and environment variable only affect the C language.
|
||||||
|
+
|
||||||
|
@item -Wstack-protector
|
||||||
|
@opindex Wstack-protector
|
||||||
|
@opindex Wno-stack-protector
|
||||||
|
@@ -6571,7 +6587,7 @@ so, the first branch is redirected to ei
|
||||||
|
second branch or a point immediately following it, depending on whether
|
||||||
|
the condition is known to be true or false.
|
||||||
|
|
||||||
|
-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
|
||||||
|
+Enabled at levels @option{-O3}.
|
||||||
|
|
||||||
|
@item -fsplit-wide-types
|
||||||
|
@opindex fsplit-wide-types
|
||||||
|
--- a/gcc/java/jvspec.c
|
||||||
|
+++ b/gcc/java/jvspec.c
|
||||||
|
@@ -627,6 +627,7 @@ lang_specific_pre_link (void)
|
||||||
|
class name. Append dummy `.c' that can be stripped by set_input so %b
|
||||||
|
is correct. */
|
||||||
|
set_input (concat (main_class_name, "main.c", NULL));
|
||||||
|
+ putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */
|
||||||
|
err = do_spec (jvgenmain_spec);
|
||||||
|
if (err == 0)
|
||||||
|
{
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
--- a/gcc/gcc.c
|
||||||
|
+++ b/gcc/gcc.c
|
||||||
|
@@ -7814,7 +7814,10 @@ getenv_spec_function (int argc, const ch
|
||||||
|
|
||||||
|
value = getenv (argv[0]);
|
||||||
|
if (!value)
|
||||||
|
- fatal_error ("environment variable %qs not defined", argv[0]);
|
||||||
|
+ {
|
||||||
|
+ warning (0, "environment variable %qs not defined", argv[0]);
|
||||||
|
+ value = "";
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* We have to escape every character of the environment variable so
|
||||||
|
they are not interpreted as active spec characters. A
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
--- a/gcc/config/arm/arm-protos.h
|
||||||
|
+++ b/gcc/config/arm/arm-protos.h
|
||||||
|
@@ -42,12 +42,12 @@ extern unsigned int arm_dbx_register_num
|
||||||
|
extern void arm_output_fn_unwind (FILE *, bool);
|
||||||
|
|
||||||
|
|
||||||
|
-#ifdef RTX_CODE
|
||||||
|
extern bool arm_vector_mode_supported_p (enum machine_mode);
|
||||||
|
extern bool arm_small_register_classes_for_mode_p (enum machine_mode);
|
||||||
|
extern int arm_hard_regno_mode_ok (unsigned int, enum machine_mode);
|
||||||
|
extern bool arm_modes_tieable_p (enum machine_mode, enum machine_mode);
|
||||||
|
extern int const_ok_for_arm (HOST_WIDE_INT);
|
||||||
|
+#ifdef RTX_CODE
|
||||||
|
extern int const_ok_for_op (HOST_WIDE_INT, enum rtx_code);
|
||||||
|
extern int arm_split_constant (RTX_CODE, enum machine_mode, rtx,
|
||||||
|
HOST_WIDE_INT, rtx, rtx, int);
|
||||||
10
toolchain/gcc/patches/4.7-linaro/999-coldfire.patch
Normal file
10
toolchain/gcc/patches/4.7-linaro/999-coldfire.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/gcc/config.gcc
|
||||||
|
+++ b/gcc/config.gcc
|
||||||
|
@@ -1610,6 +1610,7 @@ m32rle-*-linux*)
|
||||||
|
if test x$enable_threads = xyes; then
|
||||||
|
thread_file='posix'
|
||||||
|
fi
|
||||||
|
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
|
||||||
|
;;
|
||||||
|
m68k-*-elf* | fido-*-elf*)
|
||||||
|
case ${target} in
|
||||||
Loading…
Reference in a new issue