aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog15
-rw-r--r--ld/Makefile.am9
-rw-r--r--ld/Makefile.in11
-rw-r--r--ld/configure.tgt18
-rw-r--r--ld/emulparams/elf_k1om.sh35
-rw-r--r--ld/emulparams/elf_k1om_fbsd.sh3
-rw-r--r--ld/testsuite/ChangeLog9
-rw-r--r--ld/testsuite/ld-x86-64/abs-k1om.d11
-rw-r--r--ld/testsuite/ld-x86-64/protected2-k1om.d17
-rw-r--r--ld/testsuite/ld-x86-64/protected3-k1om.d16
10 files changed, 135 insertions, 9 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 220ffe5..951c8a2 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,18 @@
+2011-07-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ * Makefile.am (ALL_64_EMULATIONS): Add eelf_k1om.o and
+ eelf_k1om_fbsd.o
+ (eelf_k1om.c): New.
+ (eelf_k1om_fbsd.c): Likewise.
+ * Makefile.in: Regenerated.
+
+ * configure.tgt (targ64_extra_emuls): Add elf_k1om if elf_x86_64
+ is supported. Add elf_k1om_fbsd if elf_x86_64_fbsd is supported.
+ (targ_extra_emuls): Likewise.
+
+ * emulparams/elf_k1om.sh: New.
+ * emulparams/elf_k1om_fbsd.sh: Likewise.
+
2011-07-16 Roland McGrath <roland@hack.frob.com>
* ld.h (args_type): New field print_output_format.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 445c92e..5ae86ba 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -481,6 +481,8 @@ ALL_64_EMULATION_SOURCES = \
eelf64tilegx.c \
eelf_l1om.c \
eelf_l1om_fbsd.c \
+ eelf_k1om.c \
+ eelf_k1om_fbsd.c \
eelf_x86_64.c \
eelf_x86_64_fbsd.c \
eelf_x86_64_sol2.c \
@@ -1981,6 +1983,13 @@ eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
$(srcdir)/emulparams/elf_l1om.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
+eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} elf_k1om "$(tdir_elf_k1om)"
+eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
+ $(srcdir)/emulparams/elf_k1om.sh \
+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)"
eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 526b7e1..f062b92 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -786,6 +786,8 @@ ALL_64_EMULATION_SOURCES = \
eelf64tilegx.c \
eelf_l1om.c \
eelf_l1om_fbsd.c \
+ eelf_k1om.c \
+ eelf_k1om_fbsd.c \
eelf_x86_64.c \
eelf_x86_64_fbsd.c \
eelf_x86_64_sol2.c \
@@ -1186,6 +1188,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om_fbsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om_fbsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@
@@ -3432,6 +3436,13 @@ eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
$(srcdir)/emulparams/elf_l1om.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
+eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} elf_k1om "$(tdir_elf_k1om)"
+eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
+ $(srcdir)/emulparams/elf_k1om.sh \
+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} elf_k1om_fbsd "$(tdir_elf_k1om_fbsd)"
eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
diff --git a/ld/configure.tgt b/ld/configure.tgt
index f35298c..23cf347 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -186,23 +186,23 @@ i[3-7]86-*-linux*aout*) targ_emul=i386linux
i[3-7]86-*-linux*oldld) targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
i[3-7]86-*-linux-*) targ_emul=elf_i386
targ_extra_emuls=i386linux
- targ64_extra_emuls="elf_x86_64 elf32_x86_64 elf_l1om"
+ targ64_extra_emuls="elf_x86_64 elf32_x86_64 elf_l1om elf_k1om"
targ64_extra_libpath=elf_x86_64
targ_extra_libpath=elf32_x86_64
tdir_i386linux=${targ_alias}aout ;;
x86_64-*-linux-*) targ_emul=elf_x86_64
- targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om"
- targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om"
+ targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
+ targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"
tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;;
i[3-7]86-*-solaris2*) targ_emul=elf_i386_sol2
- targ_extra_emuls="elf_i386_ldso elf_i386 elf_x86_64_sol2 elf_x86_64 elf_l1om"
+ targ_extra_emuls="elf_i386_ldso elf_i386 elf_x86_64_sol2 elf_x86_64 elf_l1om elf_k1om"
targ_extra_libpath=$targ_extra_emuls
;;
x86_64-*-solaris2*)
targ_emul=elf_x86_64_sol2
- targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_l1om"
+ targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_l1om elf_k1om"
targ_extra_libpath=elf_i386
tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
i[3-7]86-*-unixware) targ_emul=elf_i386 ;;
@@ -220,7 +220,7 @@ i[3-7]86-*-netbsdpe*) targ_emul=i386pe
i[3-7]86-*-netbsd*) targ_emul=i386nbsd
targ_extra_emuls=elf_i386 ;;
x86_64-*-netbsd*) targ_emul=elf_x86_64
- targ_extra_emuls="elf_i386 i386nbsd elf_l1om"
+ targ_extra_emuls="elf_i386 i386nbsd elf_l1om elf_k1om"
tdir_elf_i386=`echo ${targ_alias} | \
sed -e 's/x86_64/i386/'`
case "${tdir_elf_i386}" in
@@ -231,7 +231,7 @@ x86_64-*-netbsd*) targ_emul=elf_x86_64
i[3-7]86-*-netware) targ_emul=i386nw ;;
i[3-7]86-*-elf*) targ_emul=elf_i386 ;;
x86_64-*-elf*) targ_emul=elf_x86_64
- targ_extra_emuls="elf_i386 elf_l1om"
+ targ_extra_emuls="elf_i386 elf_l1om elf_k1om"
;;
i[3-7]86-*-kaos*) targ_emul=elf_i386 ;;
i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
@@ -239,13 +239,13 @@ i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
i[3-7]86-*-dragonfly*) targ_emul=elf_i386
targ_extra_emuls="i386bsd" ;;
x86_64-*-dragonfly*) targ_emul=elf_x86_64
- targ_extra_emuls="elf_i386 elf_l1om" ;;
+ targ_extra_emuls="elf_i386 elf_l1om elf_k1om" ;;
i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
targ_emul=elf_i386_fbsd
targ_extra_emuls="elf_i386 i386bsd" ;;
x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
targ_emul=elf_x86_64_fbsd
- targ_extra_emuls="elf_i386_fbsd elf_x86_64 elf_i386 elf_l1om elf_l1om_fbsd"
+ targ_extra_emuls="elf_i386_fbsd elf_x86_64 elf_i386 elf_l1om elf_l1om_fbsd elf_k1om elf_k1om_fbsd"
targ_extra_libpath="elf_i386_fbsd"
tdir_elf_i386_fbsd=`echo ${targ_alias} \
| sed -e 's/x86_64/i386/'`
diff --git a/ld/emulparams/elf_k1om.sh b/ld/emulparams/elf_k1om.sh
new file mode 100644
index 0000000..ad4b955
--- /dev/null
+++ b/ld/emulparams/elf_k1om.sh
@@ -0,0 +1,35 @@
+. ${srcdir}/emulparams/plt_unwind.sh
+SCRIPT_NAME=elf
+ELFSIZE=64
+OUTPUT_FORMAT="elf64-k1om"
+NO_REL_RELOCS=yes
+TEXT_START_ADDR=0x400000
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
+ARCH="k1om"
+MACHINE=
+COMPILE_IN=yes
+NOP=0x90909090
+TEMPLATE_NAME=elf32
+GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
+NO_SMALL_DATA=yes
+LARGE_SECTIONS=yes
+SEPARATE_GOTPLT=24
+
+if [ "x${host}" = "x${target}" ]; then
+ case " $EMULATION_LIBPATH " in
+ *" ${EMULATION_NAME} "*)
+ NATIVE=yes
+ esac
+fi
+
+# Linux modifies the default library search path to first include
+# a 64-bit specific directory.
+case "$target" in
+ *k1om*-linux*)
+ case "$EMULATION_NAME" in
+ *k1om*) LIBPATH_SUFFIX=64 ;;
+ esac
+ ;;
+esac
diff --git a/ld/emulparams/elf_k1om_fbsd.sh b/ld/emulparams/elf_k1om_fbsd.sh
new file mode 100644
index 0000000..98f8033
--- /dev/null
+++ b/ld/emulparams/elf_k1om_fbsd.sh
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf_k1om.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+OUTPUT_FORMAT="elf64-k1om-freebsd"
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index bc01d77..28b9a83 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-22 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ld-x86-64/abs-k1om.d: New.
+ * ld-x86-64/protected2-k1om.d: Likewise.
+ * ld-x86-64/protected3-k1om.d: Likewise.
+
+ * ld-x86-64/x86-64.exp: Run abs-k1om, protected2-k1om and
+ protected3-k1om.
+
2011-07-14 H.J. Lu <hongjiu.lu@intel.com>
* ld-elf/binutils.exp (binutils_test): Also check ignored
diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
new file mode 100644
index 0000000..2c26639
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/abs-k1om.d
@@ -0,0 +1,11 @@
+#name: Absolute non-overflowing relocs
+#source: ../ld-i386/abs.s
+#source: ../ld-i386/zero.s
+#as: --64 -march=k1om
+#ld: -m elf_k1om
+#objdump: -rs -j .text
+
+.*: file format .*
+
+Contents of section \.text:
+[ ][0-9a-f]+ c800fff0 c8000110 c9c3.*
diff --git a/ld/testsuite/ld-x86-64/protected2-k1om.d b/ld/testsuite/ld-x86-64/protected2-k1om.d
new file mode 100644
index 0000000..4e03599
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/protected2-k1om.d
@@ -0,0 +1,17 @@
+#source: protected2.s
+#as: --64 -march=k1om
+#ld: -shared -melf_k1om
+#objdump: -drw
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+0+[a-f0-9]+ <foo>:
+[ ]*[a-f0-9]+: c3 retq
+
+0+[a-f0-9]+ <bar>:
+[ ]*[a-f0-9]+: e8 fa ff ff ff callq [a-f0-9]+ <foo>
+[ ]*[a-f0-9]+: c3 retq
+#pass
diff --git a/ld/testsuite/ld-x86-64/protected3-k1om.d b/ld/testsuite/ld-x86-64/protected3-k1om.d
new file mode 100644
index 0000000..36d6656
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/protected3-k1om.d
@@ -0,0 +1,16 @@
+#source: protected3.s
+#as: --64 -march=k1om
+#ld: -shared -melf_k1om
+#readelf: -h
+
+ELF Header:
+ Magic: 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00
+ Class: ELF64
+ Data: 2's complement, little endian
+ Version: 1 \(current\)
+ OS/ABI: UNIX - System V
+ ABI Version: 0
+ Type: DYN \(Shared object file\)
+ Machine: Intel K1OM
+ Version: 0x1
+#pass