diff options
| -rw-r--r-- | sys-devel/binutils/Manifest | 7 | ||||
| -rw-r--r-- | sys-devel/binutils/binutils-2.20-r1.ebuild | 15 | ||||
| -rw-r--r-- | sys-devel/binutils/binutils-2.20.1-r1.ebuild | 1 | ||||
| -rw-r--r-- | sys-devel/binutils/files/binutils-2.20-loongson2f.patch | 561 | ||||
| -rw-r--r-- | sys-devel/binutils/files/binutils-mips-tls.patch | 11 |
5 files changed, 14 insertions, 581 deletions
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index b29cbc8..bb61b58 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -1,11 +1,8 @@ -AUX binutils-2.20-loongson2f.patch 19769 RMD160 744c28f130687f496ac6d16784eeefcc46250f3b SHA1 af7aab914d09e38a5eee820a544f754422da2070 SHA256 1c4b51caa063aa70a71e8bbfcc1d1bb42abf5c4c70abd68d77eab5d7d4d23bbe AUX binutils-2.20.1-loongson2f.patch 17738 RMD160 20c4d0e470865dc1acbc5673487a729c70ade63d SHA1 d9ac59f8b5d96d872ed8f7aba58400bde4c7e462 SHA256 1e9b2772e6297e27c0079ae76bed3de20c2e1b399a7e16d0a946525e1b290b7c AUX binutils-9999-loongson2f.patch 19769 RMD160 744c28f130687f496ac6d16784eeefcc46250f3b SHA1 af7aab914d09e38a5eee820a544f754422da2070 SHA256 1c4b51caa063aa70a71e8bbfcc1d1bb42abf5c4c70abd68d77eab5d7d4d23bbe +AUX binutils-mips-tls.patch 402 RMD160 4a1d8c9db6498d1f70e6329c18db2694d9a3d8ed SHA1 62a3716ce3800e23050856ddd69f258b278bea4c SHA256 060089a4e41184653c38cdf69fa4629361575355cd82a6cb207650d105266812 AUX pr10858.diff 883 RMD160 554d96ad1ac570dac9e85bd25047268b2b2d9317 SHA1 857c259fd91c09412ce7d113eb9c434cf0c5cc6e SHA256 45cff8d364091d726dce9d8d48968fd7ad09acc24c99a36919d5d82dd90e78b7 -DIST binutils-2.20-patches-1.0.tar.bz2 7610 RMD160 83c7b5e535753687ca6c79cfecc47786763a2c71 SHA1 de70b21264d6aad10e8be8f601ec683001461e1a SHA256 069d0888f1bea4104aed2edbe3b1b9ddc29de3772fcb96989698630c07a61180 DIST binutils-2.20.1-patches-1.1.tar.bz2 14913 RMD160 5a850d8ee3880153f614e9ef659ed4764f708538 SHA1 96900b1aab6c25b537be283102d8f44654cf0542 SHA256 aa92fc88cf1a96c88c010aa95ae788c3fd95300d93caf210301a5783266f9062 DIST binutils-2.20.1.tar.bz2 17501436 RMD160 2ab2de504a85840d1ec227eff50b5f4d2cad581e SHA1 fd2ba806e6f3a55cee453cb25c86991b26a75dee SHA256 228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8 -DIST binutils-2.20.tar.bz2 17506655 RMD160 284074e2453e517d036ffce2c0f3d56439e2e5c0 SHA1 747e7b4d94bce46587236dc5f428e5b412a590dc SHA256 e1df09f0aa3b50154ef93bfefe86d65d01c22cfb44d73299ad95e772133a75b0 -EBUILD binutils-2.20-r1.ebuild 509 RMD160 113056c1a3298315d8d8877f24dd6cb66d5db115 SHA1 08a21540217169c6236b0210a8162df328ee53db SHA256 2614d59e4da6ae6ac1723d6b15939f61d380051e94142dbf93ba45bc8cb1da1a -EBUILD binutils-2.20.1-r1.ebuild 505 RMD160 9ff3cef0e68d5f86c4a9409eecda2af443c5dbf8 SHA1 b477ed9792244582b649e8adc8dee074960db129 SHA256 81eb8ded7e1c786491e08c883e57cbff2e40ef2b365ac95bb98b64f973be1fd2 +EBUILD binutils-2.20.1-r1.ebuild 546 RMD160 8c665545c02163c445e128637f1a61e61ca63400 SHA1 b242d0caa936787fd0bc803f62241b6fd57cc711 SHA256 1e99703dccb7df01ef3c19478d16d0dfe90f8a27c66b1cf97fb980242f665733 EBUILD binutils-9999.ebuild 197 RMD160 a2ebbb25f80a8107a1a527dc8b3ae8868a1f2ac8 SHA1 cbfbc5a89f5d55d543adb613c0a953e90f23c5e4 SHA256 d56af21658dde3dc96847a041c28c4099534cde45b653c0f8d08979a521de61b diff --git a/sys-devel/binutils/binutils-2.20-r1.ebuild b/sys-devel/binutils/binutils-2.20-r1.ebuild deleted file mode 100644 index 54ceef5..0000000 --- a/sys-devel/binutils/binutils-2.20-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.20.ebuild,v 1.1 2009/10/19 07:33:19 vapier Exp $ - -PATCHVER="1.0" -ELF2FLT_VER="" -inherit toolchain-binutils - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -src_unpack() { - unpack ${A} - cd "${S}" - epatch ${FILESDIR}/binutils-2.20-loongson2f.patch - epatch ${FILESDIR}/pr10858.diff -} diff --git a/sys-devel/binutils/binutils-2.20.1-r1.ebuild b/sys-devel/binutils/binutils-2.20.1-r1.ebuild index 3b84325..4b36eba 100644 --- a/sys-devel/binutils/binutils-2.20.1-r1.ebuild +++ b/sys-devel/binutils/binutils-2.20.1-r1.ebuild @@ -12,4 +12,5 @@ src_unpack() { cd "${S}" epatch ${FILESDIR}/${P}-loongson2f.patch epatch ${FILESDIR}/pr10858.diff + epatch ${FILESDIR}/${PN}-mips-tls.patch } diff --git a/sys-devel/binutils/files/binutils-2.20-loongson2f.patch b/sys-devel/binutils/files/binutils-2.20-loongson2f.patch deleted file mode 100644 index a946b74..0000000 --- a/sys-devel/binutils/files/binutils-2.20-loongson2f.patch +++ /dev/null @@ -1,561 +0,0 @@ -From 4f4447eb9b9f49cf87facbe4a15bc53973401add Mon Sep 17 00:00:00 2001 -From: Wu Zhangjin <wuzhangjin@gmail.com> -Date: Mon, 23 Nov 2009 15:13:15 +0800 -Subject: [PATCH] [PATCH] Fixups of Loongson2F - -(This v4 revision incorporates with the feedbacks from Richard - Sandiford, Zhang Fuxin, Maciej W. Rozycki, Alfred M. Szmidt and Yan - Hua, Thanks goes to them!) - -This patch adds two new options for binutils: -mfix-loongson2f-nop and --mfix-loongson2f-jump to work around the NOP and Jump instruction Issues of -Loongson2F. - --mfix-loongson2f-nop replaces the original NOP instructions by "or at,at,zero" -to work around the NOP issue. Without it, under extreme cases, cpu might -deadlock.(e.g. some have seen this with binutils 2.18, ld dies when compiling). - -The NOP issue has been solved in latest loongson2f batches, but this fix has no -side effect to them since the "or at,at,zero" is also a dummy instruction. - --mfix-loongson2f-jump inserts three instructions before the J,JR,JALR -instructions to eliminate instruction fetch from outside 256M region to work -around the JUMP instructions issue(only with some specific external chips, such -as CS5536.). Without it, under extreme cases, kernel may hang/crash with -unpredictable memory access. This fix may bring us with some potential -overhead. This issue has been solved in latest loongson2f batches. - -These two fixes are recommended when compiling kernel, but only the -first one is needed to compile applications. That's why I split them out -into two options, not just one -fix-loongson2f. More detailed -explanation about them are given by Zhang Fuxin(one of the Loongson2F -designers) as follows: - - - The NOP issue - -"The nature of the erratum is deeply related to the microarchitecture of -Loongson-2. It uses roughly a 4-way superscalar dynamically scheduled core, -instructions are excuted as much as possible in parallel with technics like -branch prediction etc. We use a 8-entry internal branch prediction queue to -keep track of each predicted branches, if some branches are proved to be -wrongly predicted, all the instructions following it will be cancelled,together -with the resources used by them, including the registers used for renaming, and -the queue entry will be freeed. There is a bug that might cause a hang when the -queue is full(some resources might been leaked due to conflict branch entries), -the workaround is to reduce the possiblity of branch queue full by using -renaming registers(they are also limited, can prevent too many simutaneos -branches). In theory this is still not enough to fully eliminate possible -hangs, but the possiblity is extremely low now and hard to be hit in real -code." - - - The JUMP instructions issue - -"The Loongson-2 series processors have quite complex micro-architecture, it will -try to execute instructions from the predicated branch of coming instruction -stream before they are confirmed to be run, if the predication of branch -direction is proved wrong later, the instructions will be cancelled, but if the -instructions is a read from memory, the read action might not be cancelled(but -the changes to register will) to enable some prefetch. This will lead to some -problems when compining with some chipsets. E.g. the AMD CS5536 used in -Yeeloong/Fuloong will hang if it gets an address in the physical address range -of 0x100000-0x200000(might be more other ranges). Speculative reads can perform -read at any address in theory(due to wrong prediction of branch directions and -the use of branch target buffer), thus in very few occasions they might cause a -hard lock of the machine. - -To prevent this, we need to prevent some addresses from entering branch -target buffers. A way to do this is that to modify all jump targets, e.g., - calulations of t9 - ... - jalr t9 => - calculations of t9 - or t9, t9, 0x80000000; // to make sure t9 is in kseg0 - jalr t9 -Of course, we have to consider 64/32bit, and modules addresses etc. - -This only need to be performed on kernel code, because only there we can have -accesses not translated/limited by TLB. For user code, it is impossible to -generate accesses to unwanted physical address. So it is safe. - -Also, to prevent addresses generated by user mode code to be used by the -kernel, we add a few empty jumps to flush the BTB upon entrance to kernel." - -2009-11-13 Wu Zhangjin <wuzhangjin@gmail.com>, Lemote Inc. - - gas/ - - * config/tc-mips.c (mips_fix_loongson2f, mips_fix_loongson2f_nop, - mips_fix_loongson2f_jump): New variables. - (md_longopts): Add New options -mfix-loongson2f-nop/jump, - -mno-fix-loongson2f-nop/jump. - (md_parse_option): Initialize variables via above options. - (options): New enums for the above options. - (md_begin): Initialize nop_insn from LOONGSON2F_NOP_INSN. - (fix_loongson2f, fix_loongson2f_nop, fix_loongson2f_jump): - New functions. - (append_insn): call fix_loongson2f(). - (mips_handle_align): Replace the implicit nops. - * config/tc-mips.h (MAX_MEM_FOR_RS_ALIGN_CODE): Modified - for the new mips_handle_align(). - * doc/c-mips.texi: Document the new options. - - gas/testsuite/ - - * gas/mips/loongson-2f-2.s: New test of -mfix-loongson2f-nop. - * gas/mips/loongson-2f-2.d: Likewise. - * gas/mips/loongson-2f-3.s: New test of -mfix-loongson2f-jump. - * gas/mips/loongson-2f-3.d: Likewise. - * gas/mips/mips.exp: Run the new tests. - - include/ - - * opcode/mips.h (LOONGSON2F_NOP_INSN): New macro. - -Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> ---- - gas/ChangeLog | 17 +++++ - gas/config/tc-mips.c | 119 +++++++++++++++++++++++++++++--- - gas/config/tc-mips.h | 2 +- - gas/doc/c-mips.texi | 13 ++++ - gas/testsuite/ChangeLog | 8 ++ - gas/testsuite/gas/mips/loongson-2f-2.d | 18 +++++ - gas/testsuite/gas/mips/loongson-2f-2.s | 10 +++ - gas/testsuite/gas/mips/loongson-2f-3.d | 35 +++++++++ - gas/testsuite/gas/mips/loongson-2f-3.s | 23 ++++++ - gas/testsuite/gas/mips/mips.exp | 2 + - include/ChangeLog | 4 + - include/opcode/mips.h | 4 + - 12 files changed, 245 insertions(+), 10 deletions(-) - create mode 100644 gas/testsuite/gas/mips/loongson-2f-2.d - create mode 100644 gas/testsuite/gas/mips/loongson-2f-2.s - create mode 100644 gas/testsuite/gas/mips/loongson-2f-3.d - create mode 100644 gas/testsuite/gas/mips/loongson-2f-3.s - -diff --git a/gas/ChangeLog b/gas/ChangeLog -index eb6cd26..3089fb0 100644 ---- a/gas/ChangeLog -+++ b/gas/ChangeLog -@@ -1,3 +1,20 @@ -+2009-11-13 Wu Zhangjin <wuzhangjin@gmail.com> -+ -+ * config/tc-mips.c (mips_fix_loongson2f, mips_fix_loongson2f_nop, -+ mips_fix_loongson2f_jump): New variables. -+ (md_longopts): Add New options -mfix-loongson2f-nop/jump, -+ -mno-fix-loongson2f-nop/jump. -+ (md_parse_option): Initialize variables via above options. -+ (options): New enums for the above options. -+ (md_begin): Initialize nop_insn from LOONGSON2F_NOP_INSN. -+ (fix_loongson2f, fix_loongson2f_nop, fix_loongson2f_jump): -+ New functions. -+ (append_insn): call fix_loongson2f(). -+ (mips_handle_align): Replace the implicit nops. -+ * config/tc-mips.h (MAX_MEM_FOR_RS_ALIGN_CODE): Modified -+ for the new mips_handle_align(). -+ * doc/c-mips.texi: Document the new options. -+ - 2009-10-13 Alan Modra <amodra@bigpond.net.au> - H.J. Lu <hongjiu.lu@intel.com> - -diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c -index 1c96480..a9991e2 100644 ---- a/gas/config/tc-mips.c -+++ b/gas/config/tc-mips.c -@@ -761,6 +761,15 @@ enum fix_vr4120_class { - NUM_FIX_VR4120_CLASSES - }; - -+/* ...likewise -mfix-loongson2f-jump. */ -+static int mips_fix_loongson2f_jump; -+ -+/* ...likewise -mfix-loongson2f-nop. */ -+static int mips_fix_loongson2f_nop; -+ -+/* True if -mfix-loongson2f-nop or -mfix-loongson2f-jump passed */ -+static int mips_fix_loongson2f; -+ - /* Given two FIX_VR4120_* values X and Y, bit Y of element X is set if - there must be at least one other instruction between an instruction - of type X and an instruction of type Y. */ -@@ -1918,6 +1927,8 @@ md_begin (void) - if (nop_insn.insn_mo == NULL && strcmp (name, "nop") == 0) - { - create_insn (&nop_insn, mips_opcodes + i); -+ if (mips_fix_loongson2f_nop) -+ nop_insn.insn_opcode = LOONGSON2F_NOP_INSN; - nop_insn.fixed_p = 1; - } - } -@@ -2731,6 +2742,53 @@ nops_for_insn_or_target (const struct mips_cl_insn *history, - return nops; - } - -+static void -+macro_build (expressionS *ep, const char *name, const char *fmt, ...); -+ -+static void fix_loongson2f_nop(struct mips_cl_insn *ip) -+{ -+ /* Fix NOP issue: Replace nops by "or at,at,zero" */ -+ if (strcmp(ip->insn_mo->name, "nop") == 0) -+ ip->insn_opcode = LOONGSON2F_NOP_INSN; -+} -+ -+static void fix_loongson2f_jump(struct mips_cl_insn *ip) -+{ -+ -+ /* Fix Jump Issue: Eliminate instruction fetch from outside 256M region -+ * jr target pc &= 'hffff_ffff_cfff_ffff -+ */ -+ if (strcmp(ip->insn_mo->name, "j") == 0 -+ || strcmp(ip->insn_mo->name, "jr") == 0 -+ || strcmp(ip->insn_mo->name, "jalr") == 0) -+ { -+ int sreg; -+ expressionS ep; -+ -+ if (! mips_opts.at) -+ return; -+ -+ sreg = EXTRACT_OPERAND (RS, *ip); -+ if (sreg == ZERO || sreg == KT0 || sreg == KT1 || sreg == ATREG) -+ return; -+ -+ ep.X_op = O_constant; -+ ep.X_add_number = 0xcfff0000; -+ macro_build (&ep, "lui", "t,u", ATREG, BFD_RELOC_HI16); -+ ep.X_add_number = 0xffff; -+ macro_build (&ep, "ori", "t,r,i", ATREG, ATREG, BFD_RELOC_LO16); -+ macro_build (NULL, "and", "d,v,t", sreg, sreg, ATREG); -+ } -+} -+ -+static void fix_loongson2f(struct mips_cl_insn *ip) -+{ -+ if (mips_fix_loongson2f_nop) -+ fix_loongson2f_nop(ip); -+ if (mips_fix_loongson2f_jump) -+ fix_loongson2f_jump(ip); -+} -+ - /* Output an instruction. IP is the instruction information. - ADDRESS_EXPR is an operand of the instruction to be used with - RELOC_TYPE. */ -@@ -2744,6 +2802,9 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, - bfd_boolean relaxed_branch = FALSE; - segment_info_type *si = seg_info (now_seg); - -+ if (mips_fix_loongson2f) -+ fix_loongson2f(ip); -+ - /* Mark instruction labels in mips16 mode. */ - mips16_mark_labels (); - -@@ -11220,6 +11281,10 @@ enum options - OPTION_MNO_7000_HILO_FIX, - OPTION_FIX_24K, - OPTION_NO_FIX_24K, -+ OPTION_FIX_LOONGSON2F_JUMP, -+ OPTION_NO_FIX_LOONGSON2F_JUMP, -+ OPTION_FIX_LOONGSON2F_NOP, -+ OPTION_NO_FIX_LOONGSON2F_NOP, - OPTION_FIX_VR4120, - OPTION_NO_FIX_VR4120, - OPTION_FIX_VR4130, -@@ -11308,6 +11373,10 @@ struct option md_longopts[] = - {"mfix7000", no_argument, NULL, OPTION_M7000_HILO_FIX}, - {"no-fix-7000", no_argument, NULL, OPTION_MNO_7000_HILO_FIX}, - {"mno-fix7000", no_argument, NULL, OPTION_MNO_7000_HILO_FIX}, -+ {"mfix-loongson2f-jump", no_argument, NULL, OPTION_FIX_LOONGSON2F_JUMP}, -+ {"mno-fix-loongson2f-jump", no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_JUMP}, -+ {"mfix-loongson2f-nop", no_argument, NULL, OPTION_FIX_LOONGSON2F_NOP}, -+ {"mno-fix-loongson2f-nop", no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_NOP}, - {"mfix-vr4120", no_argument, NULL, OPTION_FIX_VR4120}, - {"mno-fix-vr4120", no_argument, NULL, OPTION_NO_FIX_VR4120}, - {"mfix-vr4130", no_argument, NULL, OPTION_FIX_VR4130}, -@@ -11575,6 +11644,22 @@ md_parse_option (int c, char *arg) - mips_fix_24k = 0; - break; - -+ case OPTION_FIX_LOONGSON2F_JUMP: -+ mips_fix_loongson2f_jump = 1; -+ break; -+ -+ case OPTION_NO_FIX_LOONGSON2F_JUMP: -+ mips_fix_loongson2f_jump = 0; -+ break; -+ -+ case OPTION_FIX_LOONGSON2F_NOP: -+ mips_fix_loongson2f_nop = 1; -+ break; -+ -+ case OPTION_NO_FIX_LOONGSON2F_NOP: -+ mips_fix_loongson2f_nop = 0; -+ break; -+ - case OPTION_FIX_VR4120: - mips_fix_vr4120 = 1; - break; -@@ -11789,6 +11874,8 @@ md_parse_option (int c, char *arg) - return 0; - } - -+ mips_fix_loongson2f = mips_fix_loongson2f_nop || mips_fix_loongson2f_jump; -+ - return 1; - } - -@@ -14794,6 +14881,8 @@ void - mips_handle_align (fragS *fragp) - { - char *p; -+ int bytes, size, excess; -+ valueT opcode; - - if (fragp->fr_type != rs_align_code) - return; -@@ -14801,17 +14890,27 @@ mips_handle_align (fragS *fragp) - p = fragp->fr_literal + fragp->fr_fix; - if (*p) - { -- int bytes; -+ opcode = mips16_nop_insn.insn_opcode; -+ size = 2; -+ } -+ else -+ { -+ opcode = nop_insn.insn_opcode; -+ size = 4; -+ } - -- bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix; -- if (bytes & 1) -- { -- *p++ = 0; -- fragp->fr_fix++; -- } -- md_number_to_chars (p, mips16_nop_insn.insn_opcode, 2); -- fragp->fr_var = 2; -+ bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix; -+ excess = bytes % size; -+ if (excess != 0) -+ { -+ /* If we're not inserting a whole number of instructions, pad the -+ end of the fixed part of the frag with zeros */ -+ memset (p, 0, excess); -+ p += excess; -+ fragp->fr_fix += excess; - } -+ md_number_to_chars (p, opcode, size); -+ fragp->fr_var = size; - } - - static void -@@ -15523,6 +15622,8 @@ MIPS options:\n\ - -mmt generate MT instructions\n\ - -mno-mt do not generate MT instructions\n")); - fprintf (stream, _("\ -+-mfix-loongson2f-jump work around Loongson2F JUMP instructions\ -+-mfix-loongson2f-nop work around Loongson2F NOP errata\n\ - -mfix-vr4120 work around certain VR4120 errata\n\ - -mfix-vr4130 work around VR4130 mflo/mfhi errata\n\ - -mfix-24k insert a nop after ERET and DERET instructions\n\ -diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h -index 4bdf807..a0790c5 100644 ---- a/gas/config/tc-mips.h -+++ b/gas/config/tc-mips.h -@@ -59,7 +59,7 @@ extern char mips_nop_opcode (void); - extern void mips_handle_align (struct frag *); - #define HANDLE_ALIGN(fragp) mips_handle_align (fragp) - --#define MAX_MEM_FOR_RS_ALIGN_CODE (1 + 2) -+#define MAX_MEM_FOR_RS_ALIGN_CODE (3 + 4) - - struct insn_label_list; - struct mips_segment_info { -diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi -index 9ca7ebf..7b82dea 100644 ---- a/gas/doc/c-mips.texi -+++ b/gas/doc/c-mips.texi -@@ -172,6 +172,19 @@ This tells the assembler to accept MT instructions. - Cause nops to be inserted if the read of the destination register - of an mfhi or mflo instruction occurs in the following two instructions. - -+@item -mfix-loongson2f-jump -+@itemx -mno-fix-loongson2f-jump -+Eliminate instruction fetch from outside 256M region to work around the -+Loongson2F @samp{jump} instructions. Without it, under extreme cases, kernel -+may crash. The issue has been solved in latest processor batches, but this fix -+has no side effect to them. -+ -+@item -mfix-loongson2f-nop -+@itemx -mno-fix-loongson2f-nop -+Replace nops by @code{or at,at,zero} to work around the Loongson2F @samp{nop} -+errata. Without it, under extreme cases, cpu might deadlock. The issue has been -+solved in latest loongson2f batches, but this fix has no side effect to them. -+ - @item -mfix-vr4120 - @itemx -no-mfix-vr4120 - Insert nops to work around certain VR4120 errata. This option is -diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog -index 694128f..05ef210 100644 ---- a/gas/testsuite/ChangeLog -+++ b/gas/testsuite/ChangeLog -@@ -1,3 +1,11 @@ -+2009-11-13 Wu Zhangjin <wuzhangjin@gmail.com> -+ -+ * gas/mips/loongson-2f-2.s: New test of -mfix-loongson2f-nop. -+ * gas/mips/loongson-2f-2.d: Likewise. -+ * gas/mips/loongson-2f-3.s: New test of -mfix-loongson2f-jump. -+ * gas/mips/loongson-2f-3.d: Likewise. -+ * gas/mips/mips.exp: Run the new tests. -+ - 2009-10-02 Peter Bergner <bergner@vnet.ibm.com> - - * gas/ppc/476.s: New test. -diff --git a/gas/testsuite/gas/mips/loongson-2f-2.d b/gas/testsuite/gas/mips/loongson-2f-2.d -new file mode 100644 -index 0000000..f5267a8 ---- /dev/null -+++ b/gas/testsuite/gas/mips/loongson-2f-2.d -@@ -0,0 +1,18 @@ -+#as: -mfix-loongson2f-nop -+#objdump: -M reg-names=numeric -dr -+#name: ST Microelectronics Loongson-2F workarounds of nop issue -+ -+.*: file format .* -+ -+ -+Disassembly of section .text: -+ -+00000000 <loongson2f_nop_insn>: -+ 0: 00200825 move \$1,\$1 -+ 4: 00200825 move \$1,\$1 -+ 8: 00200825 move \$1,\$1 -+ c: 00200825 move \$1,\$1 -+ 10: 00200825 move \$1,\$1 -+ 14: 00200825 move \$1,\$1 -+ 18: 00200825 move \$1,\$1 -+ 1c: 00200825 move \$1,\$1 -diff --git a/gas/testsuite/gas/mips/loongson-2f-2.s b/gas/testsuite/gas/mips/loongson-2f-2.s -new file mode 100644 -index 0000000..842e157 ---- /dev/null -+++ b/gas/testsuite/gas/mips/loongson-2f-2.s -@@ -0,0 +1,10 @@ -+# Test the work around of the NOP issue of loongson2F -+ .text -+ .set noreorder -+ -+ .align 5 # Test _implicit_ nops -+loongson2f_nop_insn: -+ nop # Test _explicit_ nops -+ -+# align section end to 16-byte boundary for easier testing on multiple targets -+ .p2align 4 -diff --git a/gas/testsuite/gas/mips/loongson-2f-3.d b/gas/testsuite/gas/mips/loongson-2f-3.d -new file mode 100644 -index 0000000..99844d3 ---- /dev/null -+++ b/gas/testsuite/gas/mips/loongson-2f-3.d -@@ -0,0 +1,35 @@ -+#as: -mfix-loongson2f-jump -+#objdump: -M reg-names=numeric -dr -+#name: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue -+ -+.*: file format .* -+ -+ -+Disassembly of section .text: -+ -+00000000 <.text>: -+ 0: 3c01cfff lui \$1,0xcfff -+ 4: 3421ffff ori \$1,\$1,0xffff -+ 8: 03c1f024 and \$30,\$30,\$1 -+ c: 03c00008 jr \$30 -+ 10: 00000000 nop -+ -+ 14: 3c01cfff lui \$1,0xcfff -+ 18: 3421ffff ori \$1,\$1,0xffff -+ 1c: 03e1f824 and \$31,\$31,\$1 -+ 20: 03e00008 jr \$31 -+ 24: 00000000 nop -+ -+ 28: 3c01cfff lui \$1,0xcfff -+ 2c: 3421ffff ori \$1,\$1,0xffff -+ 30: 03c1f024 and \$30,\$30,\$1 -+ 34: 03c0f809 jalr \$30 -+ 38: 00000000 nop -+ -+ 3c: 00200008 jr \$1 -+ 40: 00000000 nop -+ -+ 44: 08000000 j 0x0 -+ 44: R_MIPS_26 external_label -+ 48: 00000000 nop -+ 4c: 00000000 nop -diff --git a/gas/testsuite/gas/mips/loongson-2f-3.s b/gas/testsuite/gas/mips/loongson-2f-3.s -new file mode 100644 -index 0000000..cbb73de ---- /dev/null -+++ b/gas/testsuite/gas/mips/loongson-2f-3.s -@@ -0,0 +1,23 @@ -+# Test the work around of the Jump instruction Issue of Loongson2F -+ .text -+ .set noreorder -+ -+ j $30 # j with register -+ nop -+ -+ jr $31 # jr -+ nop -+ -+ jalr $30 # jalr -+ nop -+ -+ .set noat -+ jr $1 # jr with at register and .set annotation -+ nop -+ .set at -+ -+ j external_label # j with label -+ nop -+ -+# align section end to 16-byte boundary for easier testing on multiple targets -+ .p2align 4 -diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp -index 6f82f46..92fa13d 100644 ---- a/gas/testsuite/gas/mips/mips.exp -+++ b/gas/testsuite/gas/mips/mips.exp -@@ -789,6 +789,8 @@ if { [istarget mips*-*-vxworks*] } { - - run_dump_test "loongson-2e" - run_dump_test "loongson-2f" -+ run_dump_test "loongson-2f-2" -+ run_dump_test "loongson-2f-3" - - run_dump_test_arches "octeon" [mips_arch_list_matching octeon] - run_list_test_arches "octeon-ill" "" \ -diff --git a/include/ChangeLog b/include/ChangeLog -index 9e6fb59..d27040d 100644 ---- a/include/ChangeLog -+++ b/include/ChangeLog -@@ -1,3 +1,7 @@ -+2009-11-13 Wu Zhangjin <wuzhangjin@gmail.com> -+ -+ * opcode/mips.h (LOONGSON2F_NOP_INSN): New macro. -+ - 2009-09-09 Martin Thuresson <martin@mtme.org> - - * bfdlink.h (struct bfd_link_hash_common_entry): Move to top -diff --git a/include/opcode/mips.h b/include/opcode/mips.h -index 27d10e6..671c6ef 100644 ---- a/include/opcode/mips.h -+++ b/include/opcode/mips.h -@@ -1106,4 +1106,8 @@ extern int bfd_mips_num_opcodes; - extern const struct mips_opcode mips16_opcodes[]; - extern const int bfd_mips16_num_opcodes; - -+/* Replace the original nops by "or at,at,zero", -+ Used to implement -mfix-loongson2f */ -+#define LOONGSON2F_NOP_INSN 0x00200825 -+ - #endif /* _MIPS_H_ */ diff --git a/sys-devel/binutils/files/binutils-mips-tls.patch b/sys-devel/binutils/files/binutils-mips-tls.patch new file mode 100644 index 0000000..c58cdcf --- /dev/null +++ b/sys-devel/binutils/files/binutils-mips-tls.patch @@ -0,0 +1,11 @@ +--- bfd/elfxx-mips.c.orig 2010-09-04 14:21:35.000000000 +0800 ++++ bfd/elfxx-mips.c 2010-09-04 14:22:14.000000000 +0800 +@@ -2772,7 +2772,7 @@ + = (struct mips_elf_link_hash_entry *) arg1; + struct mips_elf_count_tls_arg *arg = arg2; + +- if (hm->tls_type & GOT_TLS_GD) ++ if (hm->tls_type & (GOT_TLS_GD | GOT_TLS_LDM)) + arg->needed += 2; + if (hm->tls_type & GOT_TLS_IE) + arg->needed += 1; |