diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/archive.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5701e71fd4..2591ab8756 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 diff --git a/bfd/archive.c b/bfd/archive.c index 14136a045e..77f8829dc1 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -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) { |