diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch')
-rw-r--r-- | binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch b/binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch deleted file mode 100644 index 6eaee9e12c..0000000000 --- a/binutils/binutils-2.15.91.0.2/sec_link_duplicates_same_contents.patch +++ /dev/null @@ -1,44 +0,0 @@ -=================================================================== -RCS file: /cvs/src/src/bfd/elflink.c,v -retrieving revision 1.97 -retrieving revision 1.98 -diff -u -r1.97 -r1.98 ---- src/bfd/elflink.c 2004/08/18 02:45:42 1.97 -+++ src/bfd/elflink.c 2004/08/21 01:13:22 1.98 -@@ -9366,6 +9366,36 @@ - (_("%B: duplicate section `%A' has different size\n"), - abfd, sec); - break; -+ -+ case SEC_LINK_DUPLICATES_SAME_CONTENTS: -+ if (sec->size != l->sec->size) -+ (*_bfd_error_handler) -+ (_("%B: duplicate section `%A' has different size\n"), -+ abfd, sec); -+ else if (sec->size != 0) -+ { -+ bfd_byte *sec_contents, *l_sec_contents; -+ -+ if (!bfd_malloc_and_get_section (abfd, sec, &sec_contents)) -+ (*_bfd_error_handler) -+ (_("%B: warning: could not read contents of section `%A'\n"), -+ abfd, sec); -+ else if (!bfd_malloc_and_get_section (l->sec->owner, l->sec, -+ &l_sec_contents)) -+ (*_bfd_error_handler) -+ (_("%B: warning: could not read contents of section `%A'\n"), -+ l->sec->owner, l->sec); -+ else if (memcmp (sec_contents, l_sec_contents, sec->size) != 0) -+ (*_bfd_error_handler) -+ (_("%B: warning: duplicate section `%A' has different contents\n"), -+ abfd, sec); -+ -+ if (sec_contents) -+ free (sec_contents); -+ if (l_sec_contents) -+ free (l_sec_contents); -+ } -+ break; - } - - /* Set the output_section field so that lang_add_section |