Merge conflicts, bringing our changes back in:

- extra $(SHELL) and sugar for make (so that files not mode +x still work)
- safer temp file handling
- our W^X binary layout changes in ld
- OpenBSD policy for library file selection in ld
- arm and m88k changes which were not merged in time for official 2.15
- bfd core file handling
- a couple typos

New for 2.15:
- ld(1) and as(1) manpages now generated at build time
- binutils/stabs.c reverted to use our in-tree libiberty for now
- we still use our VIA C3 crypto code over stock binutils, as it recognizes
  more instructions
- new emulations for OpenBSD on mips64 machines, to help OpenBSD/sgi
- relaxed %f# handling in gas on OpenBSD/sparc64 (same as was in 2.14)

Tested on all platforms by various people; special thanks to sturm@ and
otto@.

1 files changed, 1 insertions, 1 deletions

diff --git a/gnu/usr.bin/binutils/gdb/defs.h b/gnu/usr.bin/binutils/gdb/defs.h
index 6bac44064d8..e49f9e0e5ba 100644
--- a/gnu/usr.bin/binutils/gdb/defs.h
+++ b/gnu/usr.bin/binutils/gdb/defs.h
@@ -65,7 +65,7 @@
 
 /* For BFD64 and bfd_vma.  */
 #include "bfd.h"
-#define bfd_section sec
+
 
 /* The target is partially multi-arched.  Both "tm.h" and the
    multi-arch vector provide definitions.  "tm.h" normally overrides