Remove .file directives from libgcc assembly sources
Joseph S. Myers
joseph@codesourcery.com
Wed Jul 2 16:47:00 GMT 2008
This patch removes .file directives from libgcc assembly sources.
The rationale is as follows: if there is no .file directive, the
assembler will determine the file and directory names itself, using
the "#" lines output by the compiler in the case of preprocessed
assembly sources. The resulting file and directory names will go in
any debug information generated by the assembler, and will be
accurate. If however there is a ".file" directive, this will override
the assembler's automatic file and directory determination, and it
will generate debug information referring to the file name given in
the .file directive relative to the current working directory of the
compilation. In general, there is no file with that name in the
object directory, so this generates incorrect debug information. If
the rules for building that particular object involve copying assembly
files to the object directory before building, the .file directive may
be correct, but is redundant.
This is most visible when using debug info relocation (configure
--with-debug-prefix-map); you can configure with appropriate
relocation to map both source and object directory paths into the
installation prefix, then process the debug information in the
installed objects to identify which source files, including generated
sources, it refers to, and copy those files into the installation
prefix. You then find references to files that do not exist arising
from the .file directives.
Tested with cross to arm-none-eabi, using debug info relocation, as a
representative target affected by this issue, and verified that the
patch fixes the incorrect paths in debug information. OK to commit?
2008-07-02 Joseph Myers <joseph@codesourcery.com>
* config/alpha/vms_tramp.asm, config/arm/crti.asm,
config/arm/crtn.asm, config/bfin/crti.s, config/bfin/crtlibid.s,
config/bfin/crtn.s, config/fr30/crti.asm, config/fr30/crtn.asm,
config/frv/lib1funcs.asm, config/i386/sol2-c1.asm,
config/i386/sol2-ci.asm, config/i386/sol2-cn.asm,
config/i386/sol2-gc1.asm, config/ia64/crti.asm,
config/ia64/crtn.asm, config/m68hc11/larith.asm,
config/m68hc11/m68hc11-crt0.S, config/m68k/crti.s,
config/m68k/crtn.s, config/mcore/crti.asm, config/mcore/crtn.asm,
config/rs6000/crtresfpr.asm, config/rs6000/crtresgpr.asm,
config/rs6000/crtresxfpr.asm, config/rs6000/crtresxgpr.asm,
config/rs6000/crtsavfpr.asm, config/rs6000/crtsavgpr.asm,
config/rs6000/crtsavres.asm, config/rs6000/e500crtres32gpr.asm,
config/rs6000/e500crtres64gpr.asm,
config/rs6000/e500crtres64gprctr.asm,
config/rs6000/e500crtrest32gpr.asm,
config/rs6000/e500crtrest64gpr.asm,
config/rs6000/e500crtresx32gpr.asm,
config/rs6000/e500crtresx64gpr.asm,
config/rs6000/e500crtsav32gpr.asm,
config/rs6000/e500crtsav64gpr.asm,
config/rs6000/e500crtsav64gprctr.asm,
config/rs6000/e500crtsavg32gpr.asm,
config/rs6000/e500crtsavg64gpr.asm,
config/rs6000/e500crtsavg64gprctr.asm, config/rs6000/eabi-ci.asm,
config/rs6000/eabi-cn.asm, config/rs6000/eabi.asm,
config/rs6000/sol-ci.asm, config/rs6000/sol-cn.asm,
config/rs6000/tramp.asm, config/sparc/sol2-ci.asm,
config/sparc/sol2-cn.asm: Remove .file directives.
Index: config/alpha/vms_tramp.asm
===================================================================
--- config/alpha/vms_tramp.asm (revision 137351)
+++ config/alpha/vms_tramp.asm (working copy)
@@ -33,7 +33,6 @@
.set noreorder
.set volatile
.set noat
- .file 1 "vms_tramp.asm"
.text
.align 3
.globl __tramp
Index: config/frv/lib1funcs.asm
===================================================================
--- config/frv/lib1funcs.asm (revision 137351)
+++ config/frv/lib1funcs.asm (working copy)
@@ -32,7 +32,6 @@
#ifdef L_cmpll
/* icc0 = __cmpll (long long a, long long b) */
- .file "_cmpll.s"
.globl EXT(__cmpll)
.type EXT(__cmpll),@function
.text
@@ -51,7 +50,6 @@
/* Note, because this function returns the result in ICC0, it means it can't
handle NaNs. */
- .file "_cmpf.s"
.globl EXT(__cmpf)
.type EXT(__cmpf),@function
.text
@@ -91,7 +89,6 @@
/* Note, because this function returns the result in ICC0, it means it can't
handle NaNs. */
- .file "_cmpd.s"
.globl EXT(__cmpd)
.type EXT(__cmpd),@function
.text
@@ -118,7 +115,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_addll.s"
.globl EXT(__addll)
.type EXT(__addll),@function
.text
@@ -136,7 +132,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_subll.s"
.globl EXT(__subll)
.type EXT(__subll),@function
.text
@@ -154,7 +149,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_andll.s"
.globl EXT(__andll)
.type EXT(__andll),@function
.text
@@ -172,7 +166,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_orll.s"
.globl EXT(__orll)
.type EXT(__orll),@function
.text
@@ -190,7 +183,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_xorll.s"
.globl EXT(__xorll)
.type EXT(__xorll),@function
.text
@@ -208,7 +200,6 @@
/* Note, gcc will never call this function, but it is present in case an
ABI program calls it. */
- .file "_notll.s"
.globl EXT(__notll)
.type EXT(__notll),@function
.text
@@ -241,7 +232,6 @@
* }
*/
- .file "_cmov.s"
.globl EXT(__cmov)
.type EXT(__cmov),@function
.text
Index: config/sparc/sol2-ci.asm
===================================================================
--- config/sparc/sol2-ci.asm (revision 137351)
+++ config/sparc/sol2-ci.asm (working copy)
@@ -40,8 +40,6 @@
! This file is linked in before the Values-Xx.o files and also before
! crtbegin, with which perhaps it should be merged.
- .file "crti.s"
-
.section ".init"
.proc 022
.global _init
Index: config/sparc/sol2-cn.asm
===================================================================
--- config/sparc/sol2-cn.asm (revision 137351)
+++ config/sparc/sol2-cn.asm (working copy)
@@ -37,8 +37,6 @@
! fact return. Users may put any desired instructions in those sections.
! This file is the last thing linked into any executable.
- .file "crtn.s"
-
.section ".init"
.align 4
Index: config/i386/sol2-c1.asm
===================================================================
--- config/i386/sol2-c1.asm (revision 137351)
+++ config/i386/sol2-c1.asm (working copy)
@@ -41,7 +41,6 @@
! information obtained by single stepping executables on other i386 SVR4
! implementations. This file is the first thing linked into any executable.
- .file "crt1.s"
.ident "GNU C crt1.s"
.weak _cleanup
.weak _DYNAMIC
Index: config/i386/sol2-ci.asm
===================================================================
--- config/i386/sol2-ci.asm (revision 137351)
+++ config/i386/sol2-ci.asm (working copy)
@@ -37,7 +37,6 @@
! sections. It is linked in before the values-Xx.o files and also before
! crtbegin.o.
- .file "crti.s"
.ident "GNU C crti.s"
.section .init
Index: config/i386/sol2-gc1.asm
===================================================================
--- config/i386/sol2-gc1.asm (revision 137351)
+++ config/i386/sol2-gc1.asm (working copy)
@@ -45,7 +45,6 @@
! to allow program profiling, by calling monstartup on entry and _mcleanup
! on exit
- .file "gcrt1.s"
.ident "GNU C gcrt1.s"
.weak _DYNAMIC
.text
Index: config/i386/sol2-cn.asm
===================================================================
--- config/i386/sol2-cn.asm (revision 137351)
+++ config/i386/sol2-cn.asm (working copy)
@@ -36,7 +36,6 @@
! This file just supplies returns for the .init and .fini sections. It is
! linked in after all other files.
- .file "crtn.o"
.ident "GNU C crtn.o"
.section .init
Index: config/fr30/crti.asm
===================================================================
--- config/fr30/crti.asm (revision 137351)
+++ config/fr30/crti.asm (working copy)
@@ -37,8 +37,6 @@
# .init sections. Users may put any desired instructions in those
# sections.
- .file "crti.asm"
-
.section ".init"
.global _init
.type _init,#function
Index: config/fr30/crtn.asm
===================================================================
--- config/fr30/crtn.asm (revision 137351)
+++ config/fr30/crtn.asm (working copy)
@@ -37,8 +37,6 @@
# fact return. Users may put any desired instructions in those sections.
# This file is the last thing linked into any executable.
- .file "crtn.s"
-
.section ".init"
.align 4
Index: config/m68hc11/larith.asm
===================================================================
--- config/m68hc11/larith.asm (revision 137351)
+++ config/m68hc11/larith.asm (working copy)
@@ -33,8 +33,6 @@
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
- .file "larith.asm"
-
#ifdef __HAVE_SHORT_INT__
.mode mshort
#else
Index: config/m68hc11/m68hc11-crt0.S
===================================================================
--- config/m68hc11/m68hc11-crt0.S (revision 137351)
+++ config/m68hc11/m68hc11-crt0.S (working copy)
@@ -34,7 +34,6 @@
;-----------------------------------------
; startup code
;-----------------------------------------
- .file "crt0.s"
#ifdef __HAVE_SHORT_INT__
.mode mshort
Index: config/ia64/crti.asm
===================================================================
--- config/ia64/crti.asm (revision 137351)
+++ config/ia64/crti.asm (working copy)
@@ -35,8 +35,6 @@
# .init sections. Users may put any desired instructions in those
# sections.
- .file "crti.asm"
-
.section ".init"
.align 16
.global _init
Index: config/ia64/crtn.asm
===================================================================
--- config/ia64/crtn.asm (revision 137351)
+++ config/ia64/crtn.asm (working copy)
@@ -35,8 +35,6 @@
# fact return. Users may put any desired instructions in those sections.
# This file is the last thing linked into any executable.
- .file "crtn.asm"
-
.section ".init"
;;
mov ar.pfs = r34
Index: config/m68k/crti.s
===================================================================
--- config/m68k/crti.s (revision 137351)
+++ config/m68k/crti.s (working copy)
@@ -31,7 +31,6 @@
* sections. It is linked in before crtbegin.o.
*/
- .file "crti.o"
.ident "GNU C crti.o"
.section .init
Index: config/m68k/crtn.s
===================================================================
--- config/m68k/crtn.s (revision 137351)
+++ config/m68k/crtn.s (working copy)
@@ -31,7 +31,6 @@
* It is linked in after all other files.
*/
- .file "crtn.o"
.ident "GNU C crtn.o"
.section .init
Index: config/rs6000/e500crtsav32gpr.asm
===================================================================
--- config/rs6000/e500crtsav32gpr.asm (revision 137351)
+++ config/rs6000/e500crtsav32gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsav32gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtres64gpr.asm
===================================================================
--- config/rs6000/e500crtres64gpr.asm (revision 137351)
+++ config/rs6000/e500crtres64gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtres64gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/tramp.asm
===================================================================
--- config/rs6000/tramp.asm (revision 137351)
+++ config/rs6000/tramp.asm (working copy)
@@ -35,7 +35,6 @@
/* Set up trampolines. */
- .file "tramp.asm"
.section ".text"
#include "ppc-asm.h"
#include "config.h"
Index: config/rs6000/e500crtres64gprctr.asm
===================================================================
--- config/rs6000/e500crtres64gprctr.asm (revision 137351)
+++ config/rs6000/e500crtres64gprctr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtres64gprctr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/sol-cn.asm
===================================================================
--- config/rs6000/sol-cn.asm (revision 137351)
+++ config/rs6000/sol-cn.asm (working copy)
@@ -36,7 +36,6 @@
# This file just supplies labeled ending points for the .got* and other
# special sections. It is linked in last after other modules.
- .file "scrtn.s"
.ident "GNU C scrtn.s"
#ifndef __powerpc64__
Index: config/rs6000/e500crtresx64gpr.asm
===================================================================
--- config/rs6000/e500crtresx64gpr.asm (revision 137351)
+++ config/rs6000/e500crtresx64gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtresx64gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtsavres.asm
===================================================================
--- config/rs6000/crtsavres.asm (revision 137351)
+++ config/rs6000/crtsavres.asm (working copy)
@@ -37,7 +37,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtsavres.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/eabi-ci.asm
===================================================================
--- config/rs6000/eabi-ci.asm (revision 137351)
+++ config/rs6000/eabi-ci.asm (working copy)
@@ -36,7 +36,6 @@
/* This file just supplies labeled starting points for the .got* and other
special sections. It is linked in first before other modules. */
- .file "crti.s"
.ident "GNU C crti.s"
#include <ppc-asm.h>
Index: config/rs6000/e500crtres32gpr.asm
===================================================================
--- config/rs6000/e500crtres32gpr.asm (revision 137351)
+++ config/rs6000/e500crtres32gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtres32gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtsavgpr.asm
===================================================================
--- config/rs6000/crtsavgpr.asm (revision 137351)
+++ config/rs6000/crtsavgpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtsavgpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtsavg64gprctr.asm
===================================================================
--- config/rs6000/e500crtsavg64gprctr.asm (revision 137351)
+++ config/rs6000/e500crtsavg64gprctr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsavg64gprctr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtresx32gpr.asm
===================================================================
--- config/rs6000/e500crtresx32gpr.asm (revision 137351)
+++ config/rs6000/e500crtresx32gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtresx32gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtresxgpr.asm
===================================================================
--- config/rs6000/crtresxgpr.asm (revision 137351)
+++ config/rs6000/crtresxgpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtresxgpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtsavfpr.asm
===================================================================
--- config/rs6000/crtsavfpr.asm (revision 137351)
+++ config/rs6000/crtsavfpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtsavfpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtresgpr.asm
===================================================================
--- config/rs6000/crtresgpr.asm (revision 137351)
+++ config/rs6000/crtresgpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtresgpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/sol-ci.asm
===================================================================
--- config/rs6000/sol-ci.asm (revision 137351)
+++ config/rs6000/sol-ci.asm (working copy)
@@ -36,7 +36,6 @@
# This file just supplies labeled starting points for the .got* and other
# special sections. It is linked in first before other modules.
- .file "scrti.s"
.ident "GNU C scrti.s"
#ifndef __powerpc64__
Index: config/rs6000/crtresxfpr.asm
===================================================================
--- config/rs6000/crtresxfpr.asm (revision 137351)
+++ config/rs6000/crtresxfpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtresxfpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtrest64gpr.asm
===================================================================
--- config/rs6000/e500crtrest64gpr.asm (revision 137351)
+++ config/rs6000/e500crtrest64gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtrest64gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtsavg64gpr.asm
===================================================================
--- config/rs6000/e500crtsavg64gpr.asm (revision 137351)
+++ config/rs6000/e500crtsavg64gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsavg64gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/eabi-cn.asm
===================================================================
--- config/rs6000/eabi-cn.asm (revision 137351)
+++ config/rs6000/eabi-cn.asm (working copy)
@@ -36,7 +36,6 @@
/* This file just supplies labeled ending points for the .got* and other
special sections. It is linked in last after other modules. */
- .file "crtn.s"
.ident "GNU C crtn.s"
#ifndef __powerpc64__
Index: config/rs6000/eabi.asm
===================================================================
--- config/rs6000/eabi.asm (revision 137351)
+++ config/rs6000/eabi.asm (working copy)
@@ -36,7 +36,6 @@
/* Do any initializations needed for the eabi environment */
- .file "eabi.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/crtresfpr.asm
===================================================================
--- config/rs6000/crtresfpr.asm (revision 137351)
+++ config/rs6000/crtresfpr.asm (working copy)
@@ -38,7 +38,6 @@
/* Do any initializations needed for the eabi environment */
- .file "crtresfpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtsav64gpr.asm
===================================================================
--- config/rs6000/e500crtsav64gpr.asm (revision 137351)
+++ config/rs6000/e500crtsav64gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsav64gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtsav64gprctr.asm
===================================================================
--- config/rs6000/e500crtsav64gprctr.asm (revision 137351)
+++ config/rs6000/e500crtsav64gprctr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsav64gprctr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtrest32gpr.asm
===================================================================
--- config/rs6000/e500crtrest32gpr.asm (revision 137351)
+++ config/rs6000/e500crtrest32gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtrest32gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/rs6000/e500crtsavg32gpr.asm
===================================================================
--- config/rs6000/e500crtsavg32gpr.asm (revision 137351)
+++ config/rs6000/e500crtsavg32gpr.asm (working copy)
@@ -34,7 +34,6 @@
* the executable file might be covered by the GNU General Public License.
*/
- .file "e500crtsavg32gpr.asm"
.section ".text"
#include "ppc-asm.h"
Index: config/mcore/crti.asm
===================================================================
--- config/mcore/crti.asm (revision 137351)
+++ config/mcore/crti.asm (working copy)
@@ -37,8 +37,6 @@
# .init sections. Users may put any desired instructions in those
# sections.
- .file "crti.asm"
-
.section ".init"
.global _init
.type _init,@function
Index: config/mcore/crtn.asm
===================================================================
--- config/mcore/crtn.asm (revision 137351)
+++ config/mcore/crtn.asm (working copy)
@@ -37,8 +37,6 @@
# fact return. Users may put any desired instructions in those sections.
# This file is the last thing linked into any executable.
- .file "crtn.asm"
-
.section ".init"
.align 4
Index: config/arm/crti.asm
===================================================================
--- config/arm/crti.asm (revision 137351)
+++ config/arm/crti.asm (working copy)
@@ -64,8 +64,6 @@
#endif
.endm
- .file "crti.asm"
-
.section ".init"
.align 2
.global _init
Index: config/arm/crtn.asm
===================================================================
--- config/arm/crtn.asm (revision 137351)
+++ config/arm/crtn.asm (working copy)
@@ -72,8 +72,6 @@
.endm
- .file "crtn.asm"
-
.section ".init"
;;
FUNC_END
Index: config/bfin/crtlibid.s
===================================================================
--- config/bfin/crtlibid.s (revision 137351)
+++ config/bfin/crtlibid.s (working copy)
@@ -25,7 +25,6 @@
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
- .file "crtlibid.o"
.ident "GNU C crtlibid.o"
.weak _current_shared_library_p5_offset_
Index: config/bfin/crti.s
===================================================================
--- config/bfin/crti.s (revision 137351)
+++ config/bfin/crti.s (working copy)
@@ -31,7 +31,6 @@
* sections. It is linked in before crtbegin.o.
*/
- .file "crti.o"
.ident "GNU C crti.o"
.section .init
Index: config/bfin/crtn.s
===================================================================
--- config/bfin/crtn.s (revision 137351)
+++ config/bfin/crtn.s (working copy)
@@ -31,7 +31,6 @@
* It is linked in after all other files.
*/
- .file "crtn.o"
.ident "GNU C crtn.o"
.section .init
--
Joseph S. Myers
joseph@codesourcery.com
More information about the Gcc-patches
mailing list