gcc: remove support for 4.6.2
There are no good reasons for keeping this version around when 4.6.3 and 4.6-linaro are there. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 35805
This commit is contained in:
Luka Perkov
parent
a90b6f7d90
commit
a85019072f
18 changed files with 1 additions and 946 deletions
|
|
@ -11,9 +11,6 @@ choice
|
||||||
bool "gcc 4.4.7"
|
bool "gcc 4.4.7"
|
||||||
depends avr32
|
depends avr32
|
||||||
|
|
||||||
config GCC_VERSION_4_6_2
|
|
||||||
bool "gcc 4.6.2"
|
|
||||||
|
|
||||||
config GCC_VERSION_4_6_3
|
config GCC_VERSION_4_6_3
|
||||||
bool "gcc 4.6.3"
|
bool "gcc 4.6.3"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ config GCC_DEFAULT_VERSION_4_6_LINARO
|
||||||
config GCC_VERSION
|
config GCC_VERSION
|
||||||
string
|
string
|
||||||
default "4.4.7" if GCC_VERSION_4_4_7
|
default "4.4.7" if GCC_VERSION_4_4_7
|
||||||
default "4.6.2" if GCC_VERSION_4_6_2
|
|
||||||
default "4.6.3" if GCC_VERSION_4_6_3
|
default "4.6.3" if GCC_VERSION_4_6_3
|
||||||
default "4.7.2" if GCC_VERSION_4_7_2
|
default "4.7.2" if GCC_VERSION_4_7_2
|
||||||
default "4.5-linaro" if GCC_VERSION_4_5_LINARO
|
default "4.5-linaro" if GCC_VERSION_4_5_LINARO
|
||||||
|
|
@ -33,7 +32,7 @@ config GCC_VERSION_4_5
|
||||||
|
|
||||||
config GCC_VERSION_4_6
|
config GCC_VERSION_4_6
|
||||||
bool
|
bool
|
||||||
default y if (GCC_VERSION_4_6_2 || GCC_VERSION_4_6_3 || GCC_VERSION_4_6_LINARO)
|
default y if (GCC_VERSION_4_6_3 || GCC_VERSION_4_6_LINARO)
|
||||||
|
|
||||||
config GCC_VERSION_4_7
|
config GCC_VERSION_4_7
|
||||||
bool
|
bool
|
||||||
|
|
|
||||||
|
|
@ -66,9 +66,6 @@ else
|
||||||
ifeq ($(PKG_VERSION),4.4.7)
|
ifeq ($(PKG_VERSION),4.4.7)
|
||||||
PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281
|
PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281
|
||||||
endif
|
endif
|
||||||
ifeq ($(PKG_VERSION),4.6.2)
|
|
||||||
PKG_MD5SUM:=028115c4fbfb6cfd75d6369f4a90d87e
|
|
||||||
endif
|
|
||||||
ifeq ($(PKG_VERSION),4.6.3)
|
ifeq ($(PKG_VERSION),4.6.3)
|
||||||
PKG_MD5SUM:=773092fe5194353b02bb0110052a972e
|
PKG_MD5SUM:=773092fe5194353b02bb0110052a972e
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
Author: ebotcazou
|
|
||||||
Date: Sun Sep 2 10:37:49 2012
|
|
||||||
New Revision: 190860
|
|
||||||
|
|
||||||
URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190860
|
|
||||||
Log:
|
|
||||||
PR rtl-optimization/54369
|
|
||||||
* config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
|
|
||||||
calling dbr_schedule.
|
|
||||||
* config/sparc/sparc.c (sparc_reorg): Likewise.
|
|
||||||
|
|
||||||
Modified:
|
|
||||||
branches/gcc-4_6-branch/gcc/ChangeLog
|
|
||||||
branches/gcc-4_6-branch/gcc/config/mips/mips.c
|
|
||||||
branches/gcc-4_6-branch/gcc/config/sparc/sparc.c
|
|
||||||
---
|
|
||||||
--- gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:36:54 190859
|
|
||||||
+++ gcc-4_6-branch/gcc/config/mips/mips.c 2012/09/02 10:37:49 190860
|
|
||||||
@@ -15083,7 +15083,10 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (optimize > 0 && flag_delayed_branch)
|
|
||||||
- dbr_schedule (get_insns ());
|
|
||||||
+ {
|
|
||||||
+ cleanup_barriers ();
|
|
||||||
+ dbr_schedule (get_insns ());
|
|
||||||
+ }
|
|
||||||
mips_reorg_process_insns ();
|
|
||||||
if (!TARGET_MIPS16
|
|
||||||
&& TARGET_EXPLICIT_RELOCS
|
|
||||||
--- gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:36:54 190859
|
|
||||||
+++ gcc-4_6-branch/gcc/config/sparc/sparc.c 2012/09/02 10:37:49 190860
|
|
||||||
@@ -9456,7 +9456,10 @@
|
|
||||||
/* We need to have the (essentially) final form of the insn stream in order
|
|
||||||
to properly detect the various hazards. Run delay slot scheduling. */
|
|
||||||
if (optimize > 0 && flag_delayed_branch)
|
|
||||||
- dbr_schedule (get_insns ());
|
|
||||||
+ {
|
|
||||||
+ cleanup_barriers ();
|
|
||||||
+ dbr_schedule (get_insns ());
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* Now look for specific patterns in the insn stream. */
|
|
||||||
for (insn = get_insns (); insn; insn = next)
|
|
||||||
|
|
||||||
|
|
@ -1,157 +0,0 @@
|
||||||
There is one usage in boehm-gc/os_dep.c, but it is only used if
|
|
||||||
SUNOS5SIGS is defined, which it is only if one of SUNOS5, DRSNX, HPUX, or
|
|
||||||
FREEBSD is defined, which are all not using Linux-based glibc ports.
|
|
||||||
|
|
||||||
Likewise, gcc/ada/init.c has a struct __siginfo occurence, but only for
|
|
||||||
__FreeBSD__.
|
|
||||||
|
|
||||||
config/rs6000/linux-unwind.h uses ``char siginfo[128]'', and
|
|
||||||
config/s390/linux-unwind.h also uses a constant.
|
|
||||||
|
|
||||||
I tested the following patch for sh-linux-gnu. This only covers one
|
|
||||||
configuration, but the change is pretty mechanic anyway and every place
|
|
||||||
that used to refer to struct siginfo already must have had <signal.h> in
|
|
||||||
its include path, which is the same file that declares siginfo_t.
|
|
||||||
|
|
||||||
OK to commit? This should probably also go into any active release
|
|
||||||
branches, to keep them buildable once this glibc change ripples through?
|
|
||||||
|
|
||||||
gcc/
|
|
||||||
* config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use
|
|
||||||
siginfo_t instead of struct siginfo.
|
|
||||||
* config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise.
|
|
||||||
* config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise.
|
|
||||||
* config/ia64/linux-unwind.h (ia64_fallback_frame_state)
|
|
||||||
(ia64_handle_unwabi): Likewise.
|
|
||||||
* config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise.
|
|
||||||
* config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise.
|
|
||||||
* config/sh/linux-unwind.h (shmedia_fallback_frame_state)
|
|
||||||
(sh_fallback_frame_state): Likewise.
|
|
||||||
* config/tilepro/linux-unwind.h (tile_fallback_frame_state): Likewise.
|
|
||||||
* config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise.
|
|
||||||
|
|
||||||
---
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/alpha/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/alpha/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/alpha/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/alpha/linux-unwind.h 2012-09-13 10:25:52.919072751 +0200
|
|
||||||
@@ -49,7 +49,7 @@
|
|
||||||
else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */
|
|
||||||
{
|
|
||||||
struct rt_sigframe {
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
sc = &rt_->uc.uc_mcontext;
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/bfin/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/bfin/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/bfin/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/bfin/linux-unwind.h 2012-09-13 10:26:14.819073313 +0200
|
|
||||||
@@ -48,10 +48,10 @@
|
|
||||||
{
|
|
||||||
struct rt_sigframe {
|
|
||||||
int sig;
|
|
||||||
- struct siginfo *pinfo;
|
|
||||||
+ siginfo_t *pinfo;
|
|
||||||
void *puc;
|
|
||||||
char retcode[8];
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/i386/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/i386/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/i386/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/i386/linux-unwind.h 2012-09-13 10:26:41.891074005 +0200
|
|
||||||
@@ -133,9 +133,9 @@
|
|
||||||
{
|
|
||||||
struct rt_sigframe {
|
|
||||||
int sig;
|
|
||||||
- struct siginfo *pinfo;
|
|
||||||
+ siginfo_t *pinfo;
|
|
||||||
void *puc;
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
/* The void * cast is necessary to avoid an aliasing warning.
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/ia64/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/ia64/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/ia64/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/ia64/linux-unwind.h 2012-09-13 10:26:59.251074450 +0200
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
struct sigframe {
|
|
||||||
char scratch[16];
|
|
||||||
unsigned long sig_number;
|
|
||||||
- struct siginfo *info;
|
|
||||||
+ siginfo_t *info;
|
|
||||||
struct sigcontext *sc;
|
|
||||||
} *frame_ = (struct sigframe *)context->psp;
|
|
||||||
struct sigcontext *sc = frame_->sc;
|
|
||||||
@@ -137,7 +137,7 @@
|
|
||||||
struct sigframe {
|
|
||||||
char scratch[16];
|
|
||||||
unsigned long sig_number;
|
|
||||||
- struct siginfo *info;
|
|
||||||
+ siginfo_t *info;
|
|
||||||
struct sigcontext *sc;
|
|
||||||
} *frame = (struct sigframe *)context->psp;
|
|
||||||
struct sigcontext *sc = frame->sc;
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/mips/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/mips/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/mips/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/mips/linux-unwind.h 2012-09-13 10:27:17.947074929 +0200
|
|
||||||
@@ -75,7 +75,7 @@
|
|
||||||
struct rt_sigframe {
|
|
||||||
u_int32_t ass[4]; /* Argument save space for o32. */
|
|
||||||
u_int32_t trampoline[2];
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
_sig_ucontext_t uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
sc = &rt_->uc.uc_mcontext;
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/pa/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/pa/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/pa/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/pa/linux-unwind.h 2012-09-13 10:27:27.491075173 +0200
|
|
||||||
@@ -63,7 +63,7 @@
|
|
||||||
int i;
|
|
||||||
struct sigcontext *sc;
|
|
||||||
struct rt_sigframe {
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *frame;
|
|
||||||
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/sh/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/sh/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/sh/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/sh/linux-unwind.h 2012-09-13 10:27:58.551075969 +0200
|
|
||||||
@@ -80,9 +80,9 @@
|
|
||||||
&& (*(unsigned long *) (pc+11) == 0x6ff0fff0))
|
|
||||||
{
|
|
||||||
struct rt_sigframe {
|
|
||||||
- struct siginfo *pinfo;
|
|
||||||
+ siginfo_t *pinfo;
|
|
||||||
void *puc;
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
/* The void * cast is necessary to avoid an aliasing warning.
|
|
||||||
@@ -179,7 +179,7 @@
|
|
||||||
&& (*(unsigned short *) (pc+14) == 0x00ad))))
|
|
||||||
{
|
|
||||||
struct rt_sigframe {
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_ = context->cfa;
|
|
||||||
/* The void * cast is necessary to avoid an aliasing warning.
|
|
||||||
diff -urN gcc-linaro-4.6-2012.02/gcc/config/xtensa/linux-unwind.h gcc-linaro-4.6-2012.02.new/gcc/config/xtensa/linux-unwind.h
|
|
||||||
--- gcc-linaro-4.6-2012.02/gcc/config/xtensa/linux-unwind.h 2012-02-07 11:33:31.000000000 +0100
|
|
||||||
+++ gcc-linaro-4.6-2012.02.new/gcc/config/xtensa/linux-unwind.h 2012-09-13 10:28:13.827076359 +0200
|
|
||||||
@@ -62,7 +62,7 @@
|
|
||||||
struct sigcontext *sc;
|
|
||||||
|
|
||||||
struct rt_sigframe {
|
|
||||||
- struct siginfo info;
|
|
||||||
+ siginfo_t info;
|
|
||||||
struct ucontext uc;
|
|
||||||
} *rt_;
|
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
@ -1,248 +0,0 @@
|
||||||
diff --git a/config.sub b/config.sub
|
|
||||||
--- 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* | \
|
|
||||||
@@ -1310,6 +1311,7 @@ case $os in
|
|
||||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
||||||
| -mingw32* | -linux-gnu* | -linux-android* \
|
|
||||||
| -linux-newlib* | -linux-uclibc* \
|
|
||||||
+ | -linux-musl* \
|
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
||||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
||||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
|
||||||
--- a/gcc/config.gcc
|
|
||||||
+++ b/gcc/config.gcc
|
|
||||||
@@ -478,7 +478,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
|
|
||||||
@@ -591,6 +591,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"
|
|
||||||
;;
|
|
||||||
diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
|
|
||||||
--- a/gcc/config/arm/linux-eabi.h
|
|
||||||
+++ b/gcc/config/arm/linux-eabi.h
|
|
||||||
@@ -64,6 +64,10 @@
|
|
||||||
#undef GLIBC_DYNAMIC_LINKER
|
|
||||||
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
|
|
||||||
|
|
||||||
+/* 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
|
|
||||||
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
|
||||||
--- a/gcc/config/i386/linux.h
|
|
||||||
+++ b/gcc/config/i386/linux.h
|
|
||||||
@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. If not see
|
|
||||||
/* 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 \
|
|
||||||
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
|
||||||
--- a/gcc/config/i386/linux64.h
|
|
||||||
+++ b/gcc/config/i386/linux64.h
|
|
||||||
@@ -65,6 +65,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
#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"
|
|
||||||
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
|
||||||
--- a/gcc/config/linux.h
|
|
||||||
+++ b/gcc/config/linux.h
|
|
||||||
@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
#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.RUNTIME respectively. If not, see
|
|
||||||
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.RUNTIME respectively. If not, see
|
|
||||||
|
|
||||||
#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. */
|
|
||||||
diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
|
|
||||||
--- 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
|
|
||||||
diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
|
|
||||||
--- a/gcc/config/mips/linux.h
|
|
||||||
+++ b/gcc/config/mips/linux.h
|
|
||||||
@@ -63,6 +63,8 @@ along with GCC; see the file COPYING3. If not see
|
|
||||||
|
|
||||||
#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 \
|
|
||||||
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
|
|
||||||
--- 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 */
|
|
||||||
diff --git a/libgomp/config/posix/time.c b/libgomp/config/posix/time.c
|
|
||||||
--- 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
|
|
||||||
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
|
|
||||||
--- 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"
|
|
||||||
;;
|
|
||||||
diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
|
|
||||||
--- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100
|
|
||||||
+++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100
|
|
||||||
@@ -40,9 +40,12 @@
|
|
||||||
#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 "\
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
--- 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 */
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
--- 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))))
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
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. */
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
--- 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)
|
|
||||||
|
|
||||||
|
|
@ -1,253 +0,0 @@
|
||||||
|
|
||||||
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
|
|
||||||
@@ -1399,6 +1399,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
|
|
||||||
@@ -4497,6 +4497,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
|
|
||||||
@@ -6319,7 +6335,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)
|
|
||||||
{
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
--- a/gcc/config/arm/arm-protos.h
|
|
||||||
+++ b/gcc/config/arm/arm-protos.h
|
|
||||||
@@ -41,11 +41,11 @@ 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 int const_ok_for_arm (HOST_WIDE_INT);
|
|
||||||
+#ifdef RTX_CODE
|
|
||||||
extern int arm_split_constant (RTX_CODE, enum machine_mode, rtx,
|
|
||||||
HOST_WIDE_INT, rtx, rtx, int);
|
|
||||||
extern RTX_CODE arm_canonicalize_comparison (RTX_CODE, rtx *, rtx *);
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
--- a/gcc/config.gcc
|
|
||||||
+++ b/gcc/config.gcc
|
|
||||||
@@ -1804,6 +1804,7 @@ m68k-*-linux*) # Motorola m68k's runnin
|
|
||||||
if test x$sjlj != x1; then
|
|
||||||
tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
|
|
||||||
fi
|
|
||||||
+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
|
|
||||||
;;
|
|
||||||
m68k-*-rtems*)
|
|
||||||
default_m68k_cpu=68020
|
|
||||||
Loading…
Reference in a new issue