Signed-off-by: Christian Beier <dontmind@freeshell.org>lilik-openwrt-22.03
@ -0,0 +1,23 @@ | |||
--- a/gcc/Makefile.in | |||
+++ b/gcc/Makefile.in | |||
@@ -4251,18 +4251,10 @@ | |||
doc/gccint.info: $(TEXI_GCCINT_FILES) | |||
doc/cppinternals.info: $(TEXI_CPPINT_FILES) | |||
-doc/%.info: %.texi | |||
- if [ x$(BUILD_INFO) = xinfo ]; then \ | |||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ | |||
- -I $(gcc_docdir)/include -o $@ $<; \ | |||
- fi | |||
+doc/%.info: | |||
# Duplicate entry to handle renaming of gccinstall.info | |||
-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) | |||
- if [ x$(BUILD_INFO) = xinfo ]; then \ | |||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ | |||
- -I $(gcc_docdir)/include -o $@ $<; \ | |||
- fi | |||
+doc/gccinstall.info: | |||
doc/cpp.dvi: $(TEXI_CPP_FILES) | |||
doc/gcc.dvi: $(TEXI_GCC_FILES) |
@ -0,0 +1,70 @@ | |||
diff -urN a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c | |||
--- a/gcc/tree-ssa-math-opts.c 2012-12-12 18:05:23.000000000 +0100 | |||
+++ b/gcc/tree-ssa-math-opts.c 2013-04-29 15:54:00.051998936 +0200 | |||
@@ -1280,6 +1280,47 @@ | |||
return result; | |||
} | |||
+/* Return true if stmt is a type conversion operation that can be stripped | |||
+ when used in a widening multiply operation. */ | |||
+static bool | |||
+widening_mult_conversion_strippable_p (tree result_type, gimple stmt) | |||
+{ | |||
+ enum tree_code rhs_code = gimple_assign_rhs_code (stmt); | |||
+ | |||
+ if (TREE_CODE (result_type) == INTEGER_TYPE) | |||
+ { | |||
+ tree op_type; | |||
+ tree inner_op_type; | |||
+ | |||
+ if (!CONVERT_EXPR_CODE_P (rhs_code)) | |||
+ return false; | |||
+ | |||
+ op_type = TREE_TYPE (gimple_assign_lhs (stmt)); | |||
+ | |||
+ /* If the type of OP has the same precision as the result, then | |||
+ we can strip this conversion. The multiply operation will be | |||
+ selected to create the correct extension as a by-product. */ | |||
+ if (TYPE_PRECISION (result_type) == TYPE_PRECISION (op_type)) | |||
+ return true; | |||
+ | |||
+ /* We can also strip a conversion if it preserves the signed-ness of | |||
+ the operation and doesn't narrow the range. */ | |||
+ inner_op_type = TREE_TYPE (gimple_assign_rhs1 (stmt)); | |||
+ | |||
+ /* If the inner-most type is unsigned, then we can strip any | |||
+ intermediate widening operation. If it's signed, then the | |||
+ intermediate widening operation must also be signed. */ | |||
+ if ((TYPE_UNSIGNED (inner_op_type) | |||
+ || TYPE_UNSIGNED (op_type) == TYPE_UNSIGNED (inner_op_type)) | |||
+ && TYPE_PRECISION (op_type) > TYPE_PRECISION (inner_op_type)) | |||
+ return true; | |||
+ | |||
+ return false; | |||
+ } | |||
+ | |||
+ return rhs_code == FIXED_CONVERT_EXPR; | |||
+} | |||
+ | |||
/* Return true if RHS is a suitable operand for a widening multiplication, | |||
assuming a target type of TYPE. | |||
There are two cases: | |||
@@ -1296,17 +1337,13 @@ | |||
{ | |||
gimple stmt; | |||
tree type1, rhs1; | |||
- enum tree_code rhs_code; | |||
if (TREE_CODE (rhs) == SSA_NAME) | |||
{ | |||
stmt = SSA_NAME_DEF_STMT (rhs); | |||
if (is_gimple_assign (stmt)) | |||
{ | |||
- rhs_code = gimple_assign_rhs_code (stmt); | |||
- if (TREE_CODE (type) == INTEGER_TYPE | |||
- ? !CONVERT_EXPR_CODE_P (rhs_code) | |||
- : rhs_code != FIXED_CONVERT_EXPR) | |||
+ if (! widening_mult_conversion_strippable_p (type, stmt)) | |||
rhs1 = rhs; | |||
else | |||
{ |
@ -0,0 +1,16 @@ | |||
--- a/gcc/haifa-sched.c | |||
+++ b/gcc/haifa-sched.c | |||
@@ -4654,10 +4654,12 @@ schedule_block (basic_block *target_bb) | |||
if (recog_memoized (insn) >= 0) | |||
{ | |||
+ memcpy (temp_state, curr_state, dfa_state_size); | |||
cost = state_transition (curr_state, insn); | |||
if (sched_pressure != SCHED_PRESSURE_WEIGHTED) | |||
gcc_assert (cost < 0); | |||
- cycle_issued_insns++; | |||
+ if (memcmp (temp_state, curr_state, dfa_state_size) != 0) | |||
+ cycle_issued_insns++; | |||
asm_p = false; | |||
} | |||
else |
@ -0,0 +1,65 @@ | |||
--- a/gcc/config/mips/sync.md | |||
+++ b/gcc/config/mips/sync.md | |||
@@ -136,7 +136,7 @@ | |||
[(match_operand:SI 1 "register_operand" "d") | |||
(match_operand:SI 2 "register_operand" "d") | |||
(atomic_hiqi_op:SI (match_dup 0) | |||
- (match_operand:SI 3 "register_operand" "dJ"))] | |||
+ (match_operand:SI 3 "reg_or_0_operand" "dJ"))] | |||
UNSPEC_SYNC_OLD_OP_12)) | |||
(clobber (match_scratch:SI 4 "=&d"))] | |||
"GENERATE_LL_SC" | |||
@@ -177,7 +177,7 @@ | |||
[(match_operand:SI 2 "register_operand" "d") | |||
(match_operand:SI 3 "register_operand" "d") | |||
(atomic_hiqi_op:SI (match_dup 0) | |||
- (match_operand:SI 4 "register_operand" "dJ"))] | |||
+ (match_operand:SI 4 "reg_or_0_operand" "dJ"))] | |||
UNSPEC_SYNC_OLD_OP_12)) | |||
(clobber (match_scratch:SI 5 "=&d"))] | |||
"GENERATE_LL_SC" | |||
@@ -218,7 +218,7 @@ | |||
(match_operand:SI 2 "register_operand" "d") | |||
(match_operand:SI 3 "register_operand" "d") | |||
(atomic_hiqi_op:SI (match_dup 0) | |||
- (match_operand:SI 4 "register_operand" "dJ"))] | |||
+ (match_operand:SI 4 "reg_or_0_operand" "dJ"))] | |||
UNSPEC_SYNC_NEW_OP_12)) | |||
(set (match_dup 1) | |||
(unspec_volatile:SI | |||
@@ -259,7 +259,7 @@ | |||
[(match_operand:SI 1 "register_operand" "d") | |||
(match_operand:SI 2 "register_operand" "d") | |||
(match_dup 0) | |||
- (match_operand:SI 3 "register_operand" "dJ")] | |||
+ (match_operand:SI 3 "reg_or_0_operand" "dJ")] | |||
UNSPEC_SYNC_OLD_OP_12)) | |||
(clobber (match_scratch:SI 4 "=&d"))] | |||
"GENERATE_LL_SC" | |||
@@ -298,7 +298,7 @@ | |||
(unspec_volatile:SI | |||
[(match_operand:SI 2 "register_operand" "d") | |||
(match_operand:SI 3 "register_operand" "d") | |||
- (match_operand:SI 4 "register_operand" "dJ")] | |||
+ (match_operand:SI 4 "reg_or_0_operand" "dJ")] | |||
UNSPEC_SYNC_OLD_OP_12)) | |||
(clobber (match_scratch:SI 5 "=&d"))] | |||
"GENERATE_LL_SC" | |||
@@ -337,7 +337,7 @@ | |||
[(match_operand:SI 1 "memory_operand" "+R") | |||
(match_operand:SI 2 "register_operand" "d") | |||
(match_operand:SI 3 "register_operand" "d") | |||
- (match_operand:SI 4 "register_operand" "dJ")] | |||
+ (match_operand:SI 4 "reg_or_0_operand" "dJ")] | |||
UNSPEC_SYNC_NEW_OP_12)) | |||
(set (match_dup 1) | |||
(unspec_volatile:SI | |||
@@ -546,7 +546,7 @@ | |||
(set (match_dup 1) | |||
(unspec_volatile:SI [(match_operand:SI 2 "register_operand" "d") | |||
(match_operand:SI 3 "register_operand" "d") | |||
- (match_operand:SI 4 "arith_operand" "dJ")] | |||
+ (match_operand:SI 4 "reg_or_0_operand" "dJ")] | |||
UNSPEC_SYNC_EXCHANGE_12))] | |||
"GENERATE_LL_SC" | |||
{ return mips_output_sync_loop (insn, operands); } |
@ -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,240 @@ | |||
--- a/config.sub | |||
+++ b/config.sub | |||
@@ -125,6 +125,7 @@ esac | |||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | |||
case $maybe_os in | |||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ | |||
+ linux-musl* | \ | |||
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ | |||
knetbsd*-gnu* | netbsd*-gnu* | \ | |||
kopensolaris*-gnu* | \ | |||
--- a/gcc/config.gcc | |||
+++ b/gcc/config.gcc | |||
@@ -485,7 +485,7 @@ case ${target} in | |||
esac | |||
# Common C libraries. | |||
-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" | |||
+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" | |||
# Common parts for widely ported systems. | |||
case ${target} in | |||
@@ -598,6 +598,9 @@ case ${target} in | |||
*-*-*uclibc*) | |||
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" | |||
;; | |||
+ *-*-*musl*) | |||
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" | |||
+ ;; | |||
*) | |||
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" | |||
;; | |||
--- a/gcc/config/arm/linux-eabi.h | |||
+++ b/gcc/config/arm/linux-eabi.h | |||
@@ -78,6 +78,10 @@ | |||
%{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ | |||
%{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" | |||
+/* musl has no "classic" (i.e. broken) mode */ | |||
+#undef MUSL_DYNAMIC_LINKER | |||
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" | |||
+ | |||
/* 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 | |||
--- a/gcc/config/i386/linux.h | |||
+++ b/gcc/config/i386/linux.h | |||
@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. | |||
/* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ | |||
#define LINK_EMULATION "elf_i386" | |||
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | |||
#undef ASM_SPEC | |||
#define ASM_SPEC \ | |||
--- a/gcc/config/i386/linux64.h | |||
+++ b/gcc/config/i386/linux64.h | |||
@@ -65,6 +65,9 @@ see the files COPYING3 and COPYING.RUNTI | |||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | |||
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | |||
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" | |||
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" | |||
+ | |||
#if TARGET_64BIT_DEFAULT | |||
#define SPEC_32 "m32" | |||
#define SPEC_64 "!m32" | |||
--- a/gcc/config/linux.h | |||
+++ b/gcc/config/linux.h | |||
@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTI | |||
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) | |||
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) | |||
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) | |||
+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) | |||
#else | |||
#define OPTION_GLIBC (linux_libc == LIBC_GLIBC) | |||
#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) | |||
#define OPTION_BIONIC (linux_libc == LIBC_BIONIC) | |||
+#define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
#endif | |||
#define LINUX_TARGET_OS_CPP_BUILTINS() \ | |||
@@ -54,18 +56,21 @@ see the files COPYING3 and COPYING.RUNTI | |||
uClibc or Bionic is the default C library and whether | |||
-muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ | |||
- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" | |||
+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ | |||
+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" | |||
#if DEFAULT_LIBC == LIBC_GLIBC | |||
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) | |||
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) | |||
#elif DEFAULT_LIBC == LIBC_UCLIBC | |||
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) | |||
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) | |||
#elif DEFAULT_LIBC == LIBC_BIONIC | |||
-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) | |||
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) | |||
+#elif DEFAULT_LIBC == LIBC_MUSL | |||
+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) | |||
#else | |||
#error "Unsupported DEFAULT_LIBC" | |||
#endif /* DEFAULT_LIBC */ | |||
@@ -83,13 +88,13 @@ see the files COPYING3 and COPYING.RUNTI | |||
#define LINUX_DYNAMIC_LINKER \ | |||
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ | |||
- BIONIC_DYNAMIC_LINKER) | |||
+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) | |||
#define LINUX_DYNAMIC_LINKER32 \ | |||
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ | |||
- BIONIC_DYNAMIC_LINKER32) | |||
+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) | |||
#define LINUX_DYNAMIC_LINKER64 \ | |||
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ | |||
- BIONIC_DYNAMIC_LINKER64) | |||
+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) | |||
/* Determine whether the entire c99 runtime | |||
is present in the runtime library. */ | |||
--- a/gcc/config/linux.opt | |||
+++ b/gcc/config/linux.opt | |||
@@ -30,3 +30,7 @@ Use GNU C library | |||
muclibc | |||
Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) | |||
Use uClibc C library | |||
+ | |||
+mmusl | |||
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) | |||
+Use musl C library | |||
--- a/gcc/config/mips/linux.h | |||
+++ b/gcc/config/mips/linux.h | |||
@@ -63,6 +63,8 @@ along with GCC; see the file COPYING3. | |||
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | |||
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" | |||
+ | |||
/* Borrowed from sparc/linux.h */ | |||
#undef LINK_SPEC | |||
#define LINK_SPEC \ | |||
--- a/gcc/ginclude/stddef.h | |||
+++ b/gcc/ginclude/stddef.h | |||
@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
#ifndef _GCC_SIZE_T | |||
#ifndef _SIZET_ | |||
#ifndef __size_t | |||
+#ifndef __DEFINED_size_t /* musl */ | |||
#define __size_t__ /* BeOS */ | |||
#define __SIZE_T__ /* Cray Unicos/Mk */ | |||
#define _SIZE_T | |||
@@ -200,6 +201,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
#define ___int_size_t_h | |||
#define _GCC_SIZE_T | |||
#define _SIZET_ | |||
+#define __DEFINED_size_t /* musl */ | |||
#if defined (__FreeBSD__) && (__FreeBSD__ >= 5) | |||
/* __size_t is a typedef on FreeBSD 5!, must not trash it. */ | |||
#else | |||
@@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t; | |||
typedef long ssize_t; | |||
#endif /* __BEOS__ */ | |||
#endif /* !(defined (__GNUG__) && defined (size_t)) */ | |||
+#endif /* __DEFINED_size_t */ | |||
#endif /* __size_t */ | |||
#endif /* _SIZET_ */ | |||
#endif /* _GCC_SIZE_T */ | |||
--- a/libgomp/config/posix/time.c | |||
+++ b/libgomp/config/posix/time.c | |||
@@ -28,6 +28,8 @@ | |||
The following implementation uses the most simple POSIX routines. | |||
If present, POSIX 4 clocks should be used instead. */ | |||
+#define _POSIX_C_SOURCE 199309L /* for clocks */ | |||
+ | |||
#include "libgomp.h" | |||
#include <unistd.h> | |||
#if TIME_WITH_SYS_TIME | |||
--- a/libstdc++-v3/configure.host | |||
+++ b/libstdc++-v3/configure.host | |||
@@ -237,6 +237,13 @@ case "${host_os}" in | |||
os_include_dir="os/bsd/freebsd" | |||
;; | |||
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) | |||
+ # check for musl by target | |||
+ case "${host_os}" in | |||
+ *-musl*) | |||
+ os_include_dir="os/generic" | |||
+ ;; | |||
+ *) | |||
+ | |||
if [ "$uclibc" = "yes" ]; then | |||
os_include_dir="os/uclibc" | |||
elif [ "$bionic" = "yes" ]; then | |||
@@ -245,6 +252,9 @@ case "${host_os}" in | |||
os_include_dir="os/gnu-linux" | |||
fi | |||
;; | |||
+ | |||
+ esac | |||
+ ;; | |||
hpux*) | |||
os_include_dir="os/hpux" | |||
;; | |||
--- a/gcc/config/mips/linux64.h | |||
+++ b/gcc/config/mips/linux64.h | |||
@@ -40,9 +40,12 @@ along with GCC; see the file COPYING3. | |||
#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" | |||
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" | |||
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | |||
+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1" | |||
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1" | |||
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1" | |||
#define LINUX_DYNAMIC_LINKERN32 \ | |||
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | |||
- BIONIC_DYNAMIC_LINKERN32) | |||
+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) | |||
#undef LINK_SPEC | |||
#define LINK_SPEC "\ | |||
--- a/gcc/config/sparc/linux64.h 2013-09-10 10:02:45.663973856 +0100 | |||
+++ b/gcc/config/sparc/linux64.h 2013-09-10 10:03:17.871972435 +0100 | |||
@@ -104,6 +104,9 @@ | |||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | |||
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | |||
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1" | |||
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1" | |||
+ | |||
#ifdef SPARC_BI_ARCH | |||
#undef SUBTARGET_EXTRA_SPECS |
@ -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 |
@ -0,0 +1,11 @@ | |||
--- a/libstdc++-v3/include/c_global/cstdio | |||
+++ b/libstdc++-v3/include/c_global/cstdio | |||
@@ -137,7 +137,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 | |||
@@ -421,7 +421,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); | |||
} | |||
@@ -431,7 +431,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); | |||
} | |||
@@ -441,7 +441,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); | |||
} | |||
@@ -450,7 +450,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); | |||
} | |||
@@ -459,7 +459,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,11 @@ | |||
--- a/gcc/config/arm/arm.h | |||
+++ b/gcc/config/arm/arm.h | |||
@@ -232,7 +232,7 @@ extern void (*arm_lang_output_object_att | |||
#define TARGET_BACKTRACE (leaf_function_p () \ | |||
? TARGET_TPCS_LEAF_FRAME \ | |||
: TARGET_TPCS_FRAME) | |||
-#define TARGET_LDRD (arm_arch5e && ARM_DOUBLEWORD_ALIGN) | |||
+#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN) | |||
#define TARGET_AAPCS_BASED \ | |||
(arm_abi != ARM_ABI_APCS && arm_abi != ARM_ABI_ATPCS) | |||
@ -0,0 +1,26 @@ | |||
--- a/gcc/config/arm/linux-elf.h | |||
+++ b/gcc/config/arm/linux-elf.h | |||
@@ -60,7 +60,7 @@ | |||
%{shared:-lc} \ | |||
%{!shared:%{profile:-lc_p}%{!profile:-lc}}" | |||
-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" | |||
+#define LIBGCC_SPEC "-lgcc" | |||
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
--- a/gcc/config/arm/t-linux | |||
+++ b/gcc/config/arm/t-linux | |||
@@ -23,7 +23,11 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi | |||
LIB1ASMSRC = arm/lib1funcs.asm | |||
LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ | |||
- _arm_addsubdf3 _arm_addsubsf3 | |||
+ _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 | |||
# MULTILIB_OPTIONS = mhard-float/msoft-float | |||
# MULTILIB_DIRNAMES = hard-float soft-float |
@ -0,0 +1,36 @@ | |||
--- a/libgcc/Makefile.in | |||
+++ b/libgcc/Makefile.in | |||
@@ -747,11 +747,12 @@ $(libgcov-objects): %$(objext): $(gcc_sr | |||
# 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)"; \ | |||
@@ -773,7 +774,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 | |||
@@ -954,6 +955,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 | |||
@@ -46,7 +46,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 | |||
@@ -82,10 +82,15 @@ | |||
#undef MUSL_DYNAMIC_LINKER | |||
#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" | |||
+/* 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) | |||
@ -0,0 +1,86 @@ | |||
--- a/gcc/config/arm/linux-eabi.h | |||
+++ b/gcc/config/arm/linux-eabi.h | |||
@@ -115,10 +115,6 @@ | |||
#define ENDFILE_SPEC \ | |||
LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC) | |||
-/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we | |||
- do not use -lfloat. */ | |||
-#undef LIBGCC_SPEC | |||
- | |||
/* Clear the instruction cache from `beg' to `end'. This is | |||
implemented in lib1funcs.asm, so ensure an error if this definition | |||
is used. */ | |||
--- a/gcc/config/arm/linux-elf.h | |||
+++ b/gcc/config/arm/linux-elf.h | |||
@@ -60,8 +60,6 @@ | |||
%{shared:-lc} \ | |||
%{!shared:%{profile:-lc_p}%{!profile:-lc}}" | |||
-#define LIBGCC_SPEC "-lgcc" | |||
- | |||
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
#define LINUX_TARGET_LINK_SPEC "%{h*} \ | |||
--- a/gcc/config/linux.h | |||
+++ b/gcc/config/linux.h | |||
@@ -52,6 +52,10 @@ see the files COPYING3 and COPYING.RUNTI | |||
builtin_assert ("system=posix"); \ | |||
} while (0) | |||
+#ifndef LIBGCC_SPEC | |||
+#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}" | |||
+#endif | |||
+ | |||
/* Determine which dynamic linker to use depending on whether GLIBC or | |||
uClibc or Bionic is the default C library and whether | |||
-muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
--- a/gcc/config/rs6000/linux.h | |||
+++ b/gcc/config/rs6000/linux.h | |||
@@ -88,6 +88,8 @@ | |||
#define USE_LD_AS_NEEDED 1 | |||
#endif | |||
+#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc" | |||
+ | |||
#undef TARGET_VERSION | |||
#define TARGET_VERSION fprintf (stderr, " (PowerPC GNU/Linux)"); | |||
--- a/gcc/mkmap-symver.awk | |||
+++ b/gcc/mkmap-symver.awk | |||
@@ -132,5 +132,5 @@ function output(lib) { | |||
else if (inherit[lib]) | |||
printf("} %s;\n", inherit[lib]); | |||
else | |||
- printf ("\n local:\n\t*;\n};\n"); | |||
+ printf ("\n\t*;\n};\n"); | |||
} | |||
--- a/libgcc/Makefile.in | |||
+++ b/libgcc/Makefile.in | |||
@@ -269,6 +269,12 @@ ifeq ($(enable_shared),yes) | |||
install-libunwind = install-libunwind | |||
endif | |||
+else | |||
+# Not enable_shared. | |||
+iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) | |||
+endif | |||
+ | |||
+ | |||
# For -fvisibility=hidden. We need both a -fvisibility=hidden on | |||
# the command line, and a #define to prevent libgcc2.h etc from | |||
# overriding that with #pragmas. | |||
@@ -291,13 +297,6 @@ else | |||
gen-hide-list = echo > $@ | |||
endif | |||
-else | |||
-# Not enable_shared. | |||
-iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) | |||
-vis_hide = | |||
-gen-hide-list = echo > \$@ | |||
-endif | |||
- | |||
ifneq ($(EXTRA_PARTS),) | |||
extra-parts = libgcc-extra-parts | |||
INSTALL_PARTS = $(EXTRA_PARTS) |
@ -0,0 +1,29 @@ | |||
--- a/gcc/crtstuff.c | |||
+++ b/gcc/crtstuff.c | |||
@@ -100,15 +100,20 @@ call_ ## FUNC (void) \ | |||
#if defined(OBJECT_FORMAT_ELF) \ | |||
&& !defined(OBJECT_FORMAT_FLAT) \ | |||
&& defined(HAVE_LD_EH_FRAME_HDR) \ | |||
- && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \ | |||
- && defined(__GLIBC__) && __GLIBC__ >= 2 | |||
+ && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) | |||
#include <link.h> | |||
/* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. | |||
But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */ | |||
-# if !defined(__UCLIBC__) \ | |||
- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
-# define USE_PT_GNU_EH_FRAME | |||
+# if defined(__UCLIBC__) | |||
+# if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \ | |||
+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33)) | |||
+# define USE_PT_GNU_EH_FRAME | |||
+# endif | |||
+# elif defined(__GLIBC__) | |||
+# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
+# define USE_PT_GNU_EH_FRAME | |||
+# endif | |||
# endif | |||
#endif | |||
#if defined(EH_FRAME_SECTION_NAME) && !defined(USE_PT_GNU_EH_FRAME) |
@ -0,0 +1,20 @@ | |||
--- a/gcc/config/rs6000/sysv4.h | |||
+++ b/gcc/config/rs6000/sysv4.h | |||
@@ -248,13 +248,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 |
@ -0,0 +1,11 @@ | |||
--- a/gcc/defaults.h | |||
+++ b/gcc/defaults.h | |||
@@ -383,7 +383,7 @@ see the files COPYING3 and COPYING.RUNTI | |||
/* If we have named section and we support weak symbols, then use the | |||
.jcr section for recording java classes which need to be registered | |||
at program start-up time. */ | |||
-#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
+#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
#ifndef JCR_SECTION_NAME | |||
#define JCR_SECTION_NAME ".jcr" | |||
#endif |
@ -0,0 +1,9 @@ | |||
--- gcc/gcc/config/mips/t-libgcc-mips16~ 2013-03-26 09:09:34.209077496 -0400 | |||
+++ gcc/gcc/config/mips/t-libgcc-mips16 2013-03-26 18:21:01.717303669 -0400 | |||
@@ -43,3 +43,6 @@ | |||
# Version these symbols if building libgcc.so. | |||
SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver | |||
+ | |||
+CRTSTUFF_T_CFLAGS += -mno-mips16 | |||
+CRTSTUFF_T_CFLAGS_S += -mno-mips16 |
@ -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 | |||
@@ -103,6 +103,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_cxx0x (int); | |||
@@ -441,6 +444,9 @@ c_common_handle_option (size_t scode, co | |||
global_dc->warning_as_error_requested = value; | |||
break; | |||
+ case OPT_Werror_maybe_reset: | |||
+ break; | |||
+ | |||
case OPT_Wformat: | |||
set_Wformat (value); | |||
break; | |||
@@ -584,6 +590,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; | |||
@@ -1058,6 +1070,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 | |||
@@ -363,6 +363,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 | |||
@@ -794,6 +798,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 | |||
@@ -520,6 +520,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 | |||
@@ -1156,6 +1160,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 | |||
@@ -477,8 +477,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 }, | |||
@@ -494,6 +492,8 @@ static const struct default_options defa | |||
{ OPT_LEVELS_2_PLUS, OPT_falign_functions, 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 | |||
@@ -1405,6 +1405,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 | |||
@@ -240,7 +240,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 | |||
@@ -4498,6 +4498,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 | |||
@@ -6317,7 +6333,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 | |||
@@ -7772,7 +7772,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,11 @@ | |||
--- a/gcc/config.gcc | |||
+++ b/gcc/config.gcc | |||
@@ -1805,7 +1805,7 @@ m68k-*-linux*) # Motorola m68k's runnin | |||
default_m68k_cpu=68020 | |||
default_cf_cpu=5475 | |||
with_arch=${with_arch:-m68k} | |||
- tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h" | |||
+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h m68k/linux.h" | |||
extra_options="${extra_options} m68k/ieee.opt" | |||
tm_defines="${tm_defines} MOTOROLA=1" | |||
tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs" |