8 files changed, 6 insertions, 8 deletions
diff --git a/ld/emulparams/alphavms.sh b/ld/emulparams/alphavms.sh
index ac9b3a2..ab69c26 100644
--- a/ld/emulparams/alphavms.sh
+++ b/ld/emulparams/alphavms.sh
@@ -3,5 +3,4 @@ SCRIPT_NAME=alphavms
 OUTPUT_FORMAT="vms-alpha"
 ARCH=alpha
 
-COMPILE_IN=yes
-EXTRA_EM_FILE=vms
-\ No newline at end of file
+EXTRA_EM_FILE=vms
diff --git a/ld/emulparams/elf64_ia64_vms.sh b/ld/emulparams/elf64_ia64_vms.sh
index 0688402..53a6a14 100644
--- a/ld/emulparams/elf64_ia64_vms.sh
+++ b/ld/emulparams/elf64_ia64_vms.sh
@@ -3,5 +3,4 @@ SCRIPT_NAME=ia64vms
 OUTPUT_FORMAT="elf64-ia64-vms"
 ARCH=ia64
 
-COMPILE_IN=yes
 EXTRA_EM_FILE=vms
diff --git a/ld/emulparams/elf64mmix.sh b/ld/emulparams/elf64mmix.sh
index 75e24be..fb7c4e3 100644
--- a/ld/emulparams/elf64mmix.sh
+++ b/ld/emulparams/elf64mmix.sh
@@ -16,7 +16,6 @@ DATA_ADDR='DEFINED (__.MMIX.start..data) ? __.MMIX.start..data : 0x2000000000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=mmix
 MACHINE=
-COMPILE_IN=yes
 EXTRA_EM_FILE=mmixelf
 
 # The existence of a symbol __start (or _start) should overrule Main, so
diff --git a/ld/emulparams/elf_iamcu.sh b/ld/emulparams/elf_iamcu.sh
index 1cc07cc..c158223 100644
--- a/ld/emulparams/elf_iamcu.sh
+++ b/ld/emulparams/elf_iamcu.sh
@@ -10,7 +10,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH=iamcu
 MACHINE=
-COMPILE_IN=yes
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/elf_k1om.sh b/ld/emulparams/elf_k1om.sh
index 6f15bdc..b27f5ea 100644
--- a/ld/emulparams/elf_k1om.sh
+++ b/ld/emulparams/elf_k1om.sh
@@ -11,7 +11,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="k1om"
 MACHINE=
-COMPILE_IN=yes
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/elf_l1om.sh b/ld/emulparams/elf_l1om.sh
index 7348c95..70d7682 100644
--- a/ld/emulparams/elf_l1om.sh
+++ b/ld/emulparams/elf_l1om.sh
@@ -11,7 +11,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="l1om"
 MACHINE=
-COMPILE_IN=yes
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/mmo.sh b/ld/emulparams/mmo.sh
index ca98013..6bd84d2 100644
--- a/ld/emulparams/mmo.sh
+++ b/ld/emulparams/mmo.sh
@@ -7,5 +7,4 @@ DATA_ADDR='DEFINED (__.MMIX.start..data) ? __.MMIX.start..data : 0x2000000000000
 OUTPUT_FORMAT=mmo
 RELOCATEABLE_OUTPUT_FORMAT=elf64-mmix
 ARCH=mmix
-COMPILE_IN=yes
 EXTRA_EM_FILE=mmo
diff --git a/ld/emulparams/pdp11.sh b/ld/emulparams/pdp11.sh
index 3f3326d..d79bb83 100644
--- a/ld/emulparams/pdp11.sh
+++ b/ld/emulparams/pdp11.sh
@@ -4,3 +4,8 @@ TEXT_START_ADDR=0
 TARGET_PAGE_SIZE=8192
 EXTRA_EM_FILE=pdp11
 ARCH=pdp11
+
+case "$LD_FLAG" in
+  *textonly) DATA_SEG_ADDR=0 ;;
+  *) DATA_SEG_ADDR=$DATA_ALIGNMENT ;;
+esac