From 5c33bb7eaee590656297b3942117fead4fbab8be Mon Sep 17 00:00:00 2001 From: ro Date: Tue, 12 Jan 2010 12:38:49 +0000 Subject: [PATCH] * config/mips/iris6.h (SUBTARGET_DONT_WARN_UNUSED_SPEC, SUBTARGET_WARN_UNUSED_SPEC): Move ... config/mips/iris.h (SUBTARGET_DONT_WARN_UNUSED_SPEC, SUBTARGET_WARN_UNUSED_SPEC): ... here * config/mips/iris5.h (LIBGCC_SPEC): Define. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155837 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config/mips/iris.h | 11 ++++++++++- gcc/config/mips/iris5.h | 7 ++++++- gcc/config/mips/iris6.h | 10 +--------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17d322413c5..e9ea98e4ad8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-01-12 Rainer Orth + + * config/mips/iris6.h (SUBTARGET_DONT_WARN_UNUSED_SPEC, + SUBTARGET_WARN_UNUSED_SPEC): Move ... + config/mips/iris.h (SUBTARGET_DONT_WARN_UNUSED_SPEC, + SUBTARGET_WARN_UNUSED_SPEC): ... here + * config/mips/iris5.h (LIBGCC_SPEC): Define. + 2010-01-12 Julian Brown * config/arm/neon-schedgen.ml (Utils): Don't try to diff --git a/gcc/config/mips/iris.h b/gcc/config/mips/iris.h index 373691ee6e1..24431937f23 100644 --- a/gcc/config/mips/iris.h +++ b/gcc/config/mips/iris.h @@ -1,6 +1,7 @@ /* Definitions of target machine for GNU compiler. Generic IRIX version. Copyright (C) 1993, 1995, 1996, 1998, 2000, - 2001, 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -146,6 +147,14 @@ along with GCC; see the file COPYING3. If not see #define IRIX_NO_UNRESOLVED "-no_unresolved" #endif +#ifdef IRIX_USING_GNU_LD +#define SUBTARGET_DONT_WARN_UNUSED_SPEC "" +#define SUBTARGET_WARN_UNUSED_SPEC "" +#else +#define SUBTARGET_DONT_WARN_UNUSED_SPEC "-dont_warn_unused" +#define SUBTARGET_WARN_UNUSED_SPEC "-warn_unused" +#endif + /* Generic part of the LINK_SPEC. */ #undef LINK_SPEC #define LINK_SPEC "\ diff --git a/gcc/config/mips/iris5.h b/gcc/config/mips/iris5.h index 495362ff922..c3e86fe6afb 100644 --- a/gcc/config/mips/iris5.h +++ b/gcc/config/mips/iris5.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. IRIX version 5. Copyright (C) 1993, 1995, 1996, 1998, 2000, - 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -37,6 +37,11 @@ irix-crti.o%s crtbegin.o%s" #undef LIB_SPEC #define LIB_SPEC "%{!shared:%{p:-lprof1} %{pg:-lprof1} -lc}" +/* Avoid getting two warnings for libgcc.a everytime we link. */ +#undef LIBGCC_SPEC +#define LIBGCC_SPEC \ + SUBTARGET_DONT_WARN_UNUSED_SPEC " -lgcc " SUBTARGET_WARN_UNUSED_SPEC + #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend.o%s irix-crtn.o%s %{!shared:crtn.o%s}" diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index ad2dccc42b5..026e364cf5b 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. IRIX version 6. Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 + 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -103,14 +103,6 @@ along with GCC; see the file COPYING3. If not see %{!p:/usr/lib64/mips3/crt1.o}}}}} \ irix-crti.o%s crtbegin.o%s" -#ifdef IRIX_USING_GNU_LD -#define SUBTARGET_DONT_WARN_UNUSED_SPEC "" -#define SUBTARGET_WARN_UNUSED_SPEC "" -#else -#define SUBTARGET_DONT_WARN_UNUSED_SPEC "-dont_warn_unused" -#define SUBTARGET_WARN_UNUSED_SPEC "-warn_unused" -#endif - #undef LIB_SPEC #define LIB_SPEC \ "%{mabi=n32: %{mips4:-L/usr/lib32/mips4} %{!mips4:-L/usr/lib32/mips3} \ -- 2.11.0