OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* archive.c (adjust_relative_path): Fix comment to prevent it

Browse Source 
corrupting the auto-generated bfd.h.
This commit is contained in:
Nick Clifton 2011-05-31 14:27:39 +00:00
parent 3b2f079304
commit 74ce8de7ca
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-31 Nick Clifton <nickc@redhat.com>
* archive.c (adjust_relative_path): Fix comment to prevent it
corrupting the auto-generated bfd.h.
2011-05-31 Paul Brook <paul@codesourcery.com>
* elf32-arm.c (elf32_arm_final_link_relocate): Only do bl conversion

10
bfd/archive.c
View File

@ -1346,14 +1346,18 @@ normalize (bfd *abfd ATTRIBUTE_UNUSED, const char *file)
bar.o foo/lib.a ../bar.o
foo/bar.o baz/lib.a ../foo/bar.o
bar.o ../lib.a <parent of current dir>/bar.o
../bar.o ../lib.a bar.o
../bar.o lib.a ../bar.o
; ../bar.o ../lib.a bar.o
; ../bar.o lib.a ../bar.o
foo/bar.o ../lib.a <parent of current dir>/foo/bar.o
bar.o ../../lib.a <grandparent>/<parent>/bar.o
bar.o foo/baz/lib.a ../../bar.o
Note - the returned string is in a static buffer. */
Note - the semicolons above are there to prevent the BFD chew
utility from interpreting those lines as prototypes to put into
the autogenerated bfd.h header...
Note - the string is returned in a static buffer. */
static const char *
adjust_relative_path (const char * path, const char * ref_path)
{