X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Frtl-error.c;h=f5558005c9acf9527e74aac52dc1dd6d6b07bfdb;hb=ded233a6499245a1806afef6532eadf7c2f88a5c;hp=0396fb30795b2a1e9057175130ffdff23ffbdbd6;hpb=dd9b9fc5724f3fa5479caad68d2050621cb4e0a6;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/rtl-error.c b/gcc/rtl-error.c
index 0396fb30795..f5558005c9a 100644
--- a/gcc/rtl-error.c
+++ b/gcc/rtl-error.c
@@ -1,12 +1,12 @@
 /* RTL specific diagnostic subroutines for GCC
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GCC is distributed in the hope that it will be useful,
@@ -15,9 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #undef FLOAT /* This is for hpux. They should change hpux.  */
@@ -59,20 +58,13 @@ location_for_asm (const_rtx insn)
     asmop = NULL;
 
   if (asmop)
-#ifdef USE_MAPPED_LOCATION
     loc = ASM_OPERANDS_SOURCE_LOCATION (asmop);
-#else
-    {
-      loc.file = ASM_OPERANDS_SOURCE_FILE (asmop);
-      loc.line = ASM_OPERANDS_SOURCE_LINE (asmop);
-    }
-#endif
   else
     loc = input_location;
   return loc;
 }
 
-/* Report a diagnostic MESSAGE (an errror or a WARNING) at the line number
+/* Report a diagnostic MESSAGE (an error or a WARNING) at the line number
    of the insn INSN.  This is used only when INSN is an `asm' with operands,
    and each ASM_OPERANDS records its own source file and line.  */
 static void