merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index da939f1e2d98ddc5f0afec6abddcf8a533db91bd..e722835785f29622a015ba07c3bef5b33abbb459 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-06  Jonas Maebe  <jonas.maebe@elis.ugent.be>
+
+       Add DWARF attribute value for the "Borland fastcall" calling
+       convention.
+       * elf/dwarf2.h: Add DW_CC_GNU_borland_fastcall_i386 constant.
+
 2012-01-31  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/13616