[107781] trunk/dports/devel/cctools

[jeremyhu at macports.org]

Revision: 107781
          https://trac.macports.org/changeset/107781
Author:   jeremyhu at macports.org
Date:     2013-07-05 10:41:35 -0700 (Fri, 05 Jul 2013)
Log Message:
-----------
cctools: Revert reloc changes for sparc and m88k as well

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/cctools/files/PR-37520.patch

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2013-07-05 17:33:57 UTC (rev 107780)
+++ trunk/dports/devel/cctools/Portfile	2013-07-05 17:41:35 UTC (rev 107781)
@@ -5,7 +5,7 @@
 name                    cctools
 # XCode 4.6
 version                 839
-revision                1
+revision                2
 categories              devel
 platforms               darwin
 maintainers             jeremyhu openmaintainer

Modified: trunk/dports/devel/cctools/files/PR-37520.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-37520.patch	2013-07-05 17:33:57 UTC (rev 107780)
+++ trunk/dports/devel/cctools/files/PR-37520.patch	2013-07-05 17:41:35 UTC (rev 107781)
@@ -17,3 +17,39 @@
  	    fix_new(frag_now,
  		    thisfrag - frag_now->fr_literal,
  		    4,
+--- as/m88k.c.orig	1969-12-31 16:00:00.000000000 -0800
++++ as/m88k.c	2013-07-05 10:32:19.000000000 -0700
+@@ -600,6 +600,10 @@ char *op)
+ 
+ 	/* if this instruction requires labels mark it for later */
+ 	switch (insn.reloc) {
++
++		case NO_RELOC:
++				break;
++
+ 		case M88K_RELOC_LO16:
+ 		case M88K_RELOC_HI16:
+ 				fix_new(
+--- as/sparc.c.orig	1969-12-31 16:00:00.000000000 -0800
++++ as/sparc.c	2013-07-05 10:32:14.000000000 -0700
+@@ -851,6 +851,20 @@ sparc_ip (str)
+  		  /* plug absolutes directly into opcode */
+ 
+ 		  switch(the_insn.reloc) {
++		  case SPARC_RELOC_13:
++		    if (the_insn.exp.X_seg == SEG_BIG)
++		      opcode |= (*(int *) generic_bignum) & 0x1fff;
++		    else
++		      opcode |= the_insn.exp.X_add_number & 0x1fff;
++		    the_insn.reloc = SPARC_RELOC_NONE;
++		    break;
++		  case SPARC_RELOC_22:
++		    if (the_insn.exp.X_seg == SEG_BIG)
++		      opcode |= (*(int *) generic_bignum) & 0x3fffff;
++		    else
++		      opcode |= the_insn.exp.X_add_number & 0x3fffff;
++		    the_insn.reloc = SPARC_RELOC_NONE;
++		    break;
+ 		  case SPARC_RELOC_HI22:
+ 		    /* extract upper 22 bits from constant */
+ 		    opcode |= (the_insn.exp.X_add_number >> 10) & 0x3fffff;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130705/65e38041/attachment-0001.html>