Changeset ecb28eb for core/c

Timestamp:

Jun 13, 2015 7:57:05 PM (6 years ago)

Author:

dev <dev@…>

Branches:

master

Children:

52b362d

Parents:

1a012dfc

Message:

Added support for all ARM targets provided in GMP, on platforms running Linux.

File:

• core/c/jbigi/mbuild-all.sh (modified) (7 diffs)

core/c/jbigi/mbuild-all.sh

@@ -26 +26 @@
 # Do NOT add any X86 platforms, do that below in the x86 platform list.
 #
-MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 armv5tel mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447"
+MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447"
 
 #
@@ -43 +43 @@
 
 #
+# ARM
+#
+# These platforms exist as of GMP 6.0.0.
+# Some of them will be renamed in the next version of GMP.
+ARM_PLATFORMS="armv5 armv6 armv7a armcortex8 armcortex9 armcortex15"
+# Rename output of armv7a to armv7 since that's what NBI expects.
+# This is due to versions after GMP 6.0.0 changing the target name.
+TRANSLATE_NAME_armv7a="armv7"
+
+#
+# X86_64
+#
 # Are there any other X86 platforms that work on i2p? Add them here.
 #
@@ -48 +60 @@
 # starting with k10 added for 6.0.0
 # As of GMP 6.0.0, libgmp 3,
-# the following architectures appear to build to identical code:
-#    coreisbr coreihwl coreibwl
-#    core2 corei
-#    bulldozer piledriver streamroller excavator
-#    bobcat jaguar
-#    k62 k63
-#    viac32 pentium3
-#
-# Even more duplicates are in 32-bit mode, so it doesn't pay to have everything for 32 bit.
-#
 X86_64_PLATFORMS="coreisbr coreihwl coreibwl bobcat jaguar bulldozer piledriver steamroller excavator atom athlon64 core2 corei nano pentium4 k10"
 
@@ -177 +179 @@
                 x86)
                         PLATFORM_LIST="${X86_PLATFORMS}";;
+                arm*)
+                        PLATFORM_LIST="${ARM_PLATFORMS}";;
                 *)
                         PLATFORM_LIST="${LINUX_PLATFORMS}";;
@@ -230 +234 @@
         echo "Attempting .${4} creation for ${3}${5}${2}${6}"
         ../../build_jbigi.sh static || return 1
-        cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${2}${6}.${4}
+        PLATFORM="${2}"
+        eval TRANSLATED_NAME=\$TRANSLATE_NAME_$PLATFORM
+        if [ -n "$TRANSLATED_NAME" ]; then
+            PLATFORM="${TRANSLATED_NAME}"
+        fi
+        cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${PLATFORM}${6}.${4}
         return 0
 }
@@ -252 +261 @@
             export ABI=32
         fi
-        sleep 1
-        
+
         # Nonfatal bail out on unsupported platform.
         (cd ../../gmp-${1}; make clean)
@@ -292 +300 @@
 fi
 
-# Don't touch this one.
-NO_PLATFORM=none
-
-for x in $X86_PLATFORMS
+
+for x in $PLATFORM_LIST
 do
         (