[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#216528: busybox-cvs doesn't build on s390



tag 216528 patch
thanks

Hi,

consider the attached patch. I tried it on raptor.d.o and it builds now.
Tell me if I should upload it because the last upload was also an NMU.

bye,
  Roland
diff -u busybox-cvs-20030926/debian/changelog busybox-cvs-20030926/debian/changelog
--- busybox-cvs-20030926/debian/changelog
+++ busybox-cvs-20030926/debian/changelog
@@ -1,3 +1,11 @@
+busybox-cvs (20030926-2.2) unstable; urgency=low
+
+  * NMU
+  * Renamed the symbol R_390_GOTOFF to R_390_GOTOFF32 in
+    modutils/obj/obj_s390{,x}.c (Closes: #216528)
+
+ -- Roland Stigge <stigge@antcom.de>  Sun,  2 Nov 2003 23:44:37 +0100
+
 busybox-cvs (20030926-2.1) unstable; urgency=low
 
   * NMU
diff -u busybox-cvs-20030926/modutils/obj/obj_s390.c busybox-cvs-20030926/modutils/obj/obj_s390.c
--- busybox-cvs-20030926/modutils/obj/obj_s390.c
+++ busybox-cvs-20030926/modutils/obj/obj_s390.c
@@ -201,7 +201,7 @@
         *(unsigned int *) loc += isym->gotent.offset;
       break;
 
-    case R_390_GOTOFF:
+    case R_390_GOTOFF32:
       assert(got != 0);
       *loc += v - got;
       break;
@@ -261,7 +261,7 @@
             /* The next three don't need got entries but the address
                of the got itself.  */
 	    case R_390_GOTPC:
-	    case R_390_GOTOFF:
+	    case R_390_GOTOFF32:
 	      gotneeded = 1;
               break;
 
diff -u busybox-cvs-20030926/modutils/obj/obj_s390x.c busybox-cvs-20030926/modutils/obj/obj_s390x.c
--- busybox-cvs-20030926/modutils/obj/obj_s390x.c
+++ busybox-cvs-20030926/modutils/obj/obj_s390x.c
@@ -231,7 +231,7 @@
         *(unsigned int *) loc += isym->gotent.offset >> 1;
       break;
 
-    case R_390_GOTOFF:
+    case R_390_GOTOFF32:
       assert(got != 0);
       *loc += v - got;
       break;
@@ -294,7 +294,7 @@
                of the got itself.  */
            case R_390_GOTPC:
             case R_390_GOTPCDBL:
-           case R_390_GOTOFF:
+           case R_390_GOTOFF32:
              gotneeded = 1;
               break;
 

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: