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@.

13 files changed, 22 insertions, 10 deletions

diff --git a/gnu/usr.bin/binutils/ld/emulparams/armpe.sh b/gnu/usr.bin/binutils/ld/emulparams/armpe.sh
index 257c9ded5f5..aa605366e8c 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/armpe.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/armpe.sh
@@ -1,8 +1,12 @@
 ARCH=arm
 SCRIPT_NAME=pe
+
 OUTPUT_FORMAT="pei-arm-little"
 LITTLE_OUTPUT_FORMAT="pei-arm-little"
 BIG_OUTPUT_FORMAT="pei-arm-big"
+
+RELOCATEABLE_OUTPUT_FORMAT="pe-arm-little"
+
 TEMPLATE_NAME=pe
 ENTRY="_mainCRTStartup"
 SUBSYSTEM=PE_DEF_SUBSYSTEM
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
index 15a837df28c..af23252949f 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32_sparc.sh
@@ -10,4 +10,5 @@ MACHINE=
 TEMPLATE_NAME=elf32
 DATA_PLT=
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
index fa7d671ffdf..94e1c9c9a24 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32bmip.sh
@@ -8,6 +8,7 @@ LITTLE_OUTPUT_FORMAT="elf32-littlemips"
 TEXT_START_ADDR=0x0400000
 test -n "${EMBEDDED}" || DATA_ADDR=0x10000000
 MAXPAGESIZE=0x40000
+COMMONPAGESIZE=0x1000
 NONPAGED_TEXT_START_ADDR=0x0400000
 SHLIB_TEXT_START_ADDR=0x5ffe0000
 test -n "${EMBEDDED}" || TEXT_DYNAMIC=
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
index d2d704135a5..d95cb786856 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf32ppc.sh
@@ -4,10 +4,12 @@
 TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=ppc32elf
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-powerpc"
 TEXT_START_ADDR=0x01800000
 MAXPAGESIZE=0x10000
+COMMONPAGESIZE=0x1000
 ARCH=powerpc:common
 MACHINE=
 BSS_PLT=
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf64_sparc.sh b/gnu/usr.bin/binutils/ld/emulparams/elf64_sparc.sh
index ab3eec0ec60..0c0f5d89e3d 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf64_sparc.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf64_sparc.sh
@@ -8,6 +8,7 @@ ARCH="sparc:v9"
 MACHINE=
 DATA_PLT=
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 NOP=0x01000000
 NO_SMALL_DATA=yes
 
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf64alpha.sh b/gnu/usr.bin/binutils/ld/emulparams/elf64alpha.sh
index 2d16e9caba6..093c8dfd8e1 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf64alpha.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf64alpha.sh
@@ -11,6 +11,7 @@ NONPAGED_TEXT_START_ADDR="0x120000000"
 ARCH=alpha
 MACHINE=
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 DATA_PLT=
 # Note that the number is always big-endian, thus we have to 
 # reverse the digit string.
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh b/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
index f1b8522fe6f..2382286b9af 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf_i386.sh
@@ -9,4 +9,5 @@ MACHINE=
 NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes
diff --git a/gnu/usr.bin/binutils/ld/emulparams/elf_x86_64.sh b/gnu/usr.bin/binutils/ld/emulparams/elf_x86_64.sh
index 61e8f29f94f..6d3705828b2 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/elf_x86_64.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/elf_x86_64.sh
@@ -10,6 +10,7 @@ MACHINE=
 NOP=0x90909090
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes
 
 if [ "x${host}" = "x${target}" ]; then
diff --git a/gnu/usr.bin/binutils/ld/emulparams/gld960.sh b/gnu/usr.bin/binutils/ld/emulparams/gld960.sh
index ef81a78a10e..1e039654fab 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/gld960.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/gld960.sh
@@ -1,7 +1,7 @@
 SCRIPT_NAME=i960
 OUTPUT_FORMAT=""
-TEXT_START_ADDR=??
-TARGET_PAGE_SIZE=??
+TEXT_START_ADDR=0
+TARGET_PAGE_SIZE=128
 ARCH=i960
 TEMPLATE_NAME=gld960
 GLD_STYLE=1
diff --git a/gnu/usr.bin/binutils/ld/emulparams/gld960coff.sh b/gnu/usr.bin/binutils/ld/emulparams/gld960coff.sh
index 78202208b4f..65b0dcab42f 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/gld960coff.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/gld960coff.sh
@@ -1,7 +1,7 @@
 SCRIPT_NAME=i960
 OUTPUT_FORMAT=""
-TEXT_START_ADDR=??
-TARGET_PAGE_SIZE=??
+TEXT_START_ADDR=0
+TARGET_PAGE_SIZE=128
 ARCH=i960
 TEMPLATE_NAME=gld960c
 GLD_STYLE=1
diff --git a/gnu/usr.bin/binutils/ld/emulparams/lnk960.sh b/gnu/usr.bin/binutils/ld/emulparams/lnk960.sh
index 3cf3fc49769..4a650f750ab 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/lnk960.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/lnk960.sh
@@ -1,6 +1,6 @@
 SCRIPT_NAME=i960
 OUTPUT_FORMAT=""
-TEXT_START_ADDR=??
-TARGET_PAGE_SIZE=??
+TEXT_START_ADDR=0
+TARGET_PAGE_SIZE=128
 ARCH=i960
 TEMPLATE_NAME=lnk960
diff --git a/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh b/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
index 6c6737c3329..d48a1eba950 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/m88kbcs.sh
@@ -1,5 +1,5 @@
 SCRIPT_NAME=m88kbcs
 OUTPUT_FORMAT="coff-m88kbcs"
-TEXT_START_ADDR=??
-TARGET_PAGE_SIZE=??
+TEXT_START_ADDR=0
+TARGET_PAGE_SIZE=128
 ARCH=m88k
diff --git a/gnu/usr.bin/binutils/ld/emulparams/vanilla.sh b/gnu/usr.bin/binutils/ld/emulparams/vanilla.sh
index d8a3b72dbf9..eabb7cddd32 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/vanilla.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/vanilla.sh
@@ -1,5 +1,5 @@
 SCRIPT_NAME=vanilla
-TEXT_START_ADDR=??
-TARGET_PAGE_SIZE=??
+TEXT_START_ADDR=0
+TARGET_PAGE_SIZE=128
 ARCH=unknown
 TEMPLATE_NAME=vanilla