Bug 1190 etc: Update toolchain links, fix TARGET_PLATFORM env vars (crosscompile), add linux-arm64-aarch64

22 files changed, 41 insertions, 40 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index 34c1469..f9f7e69 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -51,7 +51,7 @@ function connect_2 {
   done
 }
 
-function connect_30 {
+function connect_31 {
   . ./profile.ant
   . ./profile.amd64.j2se8
 
@@ -61,12 +61,12 @@ function connect_30 {
 
   export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
-    export NODE_LABEL=label/linux-armv7-img
-    HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7
+    export NODE_LABEL=label/linux-armv7hf-img
+    HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
     JENKINS_WS=$HOST_ROOT/workspace
 
     # arm-linux-gnueabi == armel triplet
-    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armsf-linux-gnueabi/bin:$PATH
+    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armhf-linux-gnueabi/bin:$PATH
     export PATH
 
     export HOST_UID=jogamp
@@ -75,14 +75,15 @@ function connect_30 {
 
     export TARGET_UID=jogamp
     export TARGET_IP=panda01
-    export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7
+    export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
     export TARGET_ANT_HOME=/usr/share/ant
 
-    export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armel
-    export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
-    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm
+    export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+    export TARGET_PLATFORM_USRROOT=/opt-linux-armv6-armhf
+    export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/arm
 
-    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6.xml
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6hf.xml
 
     export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
@@ -92,13 +93,13 @@ function connect_30 {
     if [ ! -z "$sshpid" ] ; then
 	kill -9 $sshpid
     fi
-    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6030:localhost:5555 -N &
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6031:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7-jogamp-arm32-sgothel-030/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp
   done
 }
 
-function connect_31 {
+function connect_32 {
   . ./profile.ant
   . ./profile.amd64.j2se8
 
@@ -109,11 +110,11 @@ function connect_31 {
   export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
     export NODE_LABEL=label/linux-armv7hf-img
-    HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
+    HOST_ROOT=/home/jogamp/JogAmpSlaveARM64
     JENKINS_WS=$HOST_ROOT/workspace
 
     # arm-linux-gnueabi == armel triplet
-    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armhf-linux-gnueabi/bin:$PATH
+    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/aarch64-linux-gnueabi/bin:$PATH
     export PATH
 
     export HOST_UID=jogamp
@@ -125,11 +126,12 @@ function connect_31 {
     export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
     export TARGET_ANT_HOME=/usr/share/ant
 
-    export TARGET_PLATFORM_ROOT=/opt-linux-armv6-armhf
-    export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
-    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm
+    export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+    export TARGET_PLATFORM_USRROOT=/opt-linux-arm64
+    export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/aarch64
 
-    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6hf.xml
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-aarch64.xml
 
     export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
@@ -139,13 +141,12 @@ function connect_31 {
     if [ ! -z "$sshpid" ] ; then
 	kill -9 $sshpid
     fi
-    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6031:localhost:5555 -N &
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6032:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARM64-jogamp-aarch64-sgothel-032/slave-agent.jnlp
   done
 }
 
-
 function connect_40 {
   . ./profile.ant
   . ./profile.amd64.j2se8
@@ -190,7 +191,7 @@ function connect_40 {
     export TARGET_TRIPLE=arm-linux-androideabi
 
     export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-    export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
+    export TARGET_PLATFORM_SYSROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
 
     # Need to add toolchain bins to the PATH. 
     export PATH_VANILLA=$PATH
@@ -257,7 +258,7 @@ function connect_41 {
     export TARGET_TRIPLE=aarch64-linux-android
 
     export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-    export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm64
+    export TARGET_PLATFORM_SYSROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm64
 
     # Need to add toolchain bins to the PATH. 
     export PATH_VANILLA=$PATH
@@ -287,12 +288,12 @@ function connect_41 {
 connect_2 > linux64-AMD58xx-debian7-jogamp-x64-sgothel-002.log 2>&1 &
 disown $!
 
-#connect_30 > linuxARMv7-jogamp-arm32-sgothel-030.log 2>&1 &
-#disown $!
-
 connect_31 > linuxARMv7hf-jogamp-arm32hf-sgothel-031.log 2>&1 &
 disown $!
 
+connect_32 > linuxARM64-jogamp-aarch64-sgothel-032.log 2>&1 &
+disown $!
+
 connect_40 > androidARMv7-jogamp-arm32-sgothel-040.log 2>&1 &
 disown $!
 
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++
new file mode 120000
index 0000000..c920aa1
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-c++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc
new file mode 120000
index 0000000..dbba1df
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-cc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++
new file mode 120000
index 0000000..adeda86
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-g++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc
new file mode 120000
index 0000000..655df00
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld
new file mode 120000
index 0000000..1931f6b
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-ld.bfd
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump
new file mode 120000
index 0000000..26f2062
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip
new file mode 120000
index 0000000..2ecfa61
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-strip
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
index b625efa..1c36608 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-c++
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-c++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
index 6b785db..5bd6938 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-cc
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-cc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
index 29bf2d3..08ee1e8 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-g++
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-g++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
index ad74056..1bc2286 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-gcc
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
index 6d1bd13..2b4985e 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-ld
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-ld.bfd
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
index 9502840..dd058e0 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-objdump
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
index a4ce508..e366f85 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
@@ -1 +1 @@
-/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-strip
\ No newline at end of file
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-strip
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++
deleted file mode 120000
index b13ecea..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/c++
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-c++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc
deleted file mode 120000
index 9701ec5..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/cc
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-cc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++
deleted file mode 120000
index 5869038..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/g++
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-g++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/gcc
deleted file mode 120000
index 171bfb6..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/gcc
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/ld
deleted file mode 120000
index f10f5b8..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/ld
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-ld
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/objdump
deleted file mode 120000
index 8e28b95..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/objdump
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/strip
deleted file mode 120000
index 1e5fe91..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armsf-linux-gnueabi/bin/strip
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-strip
\ No newline at end of file