Changeset c2a6983 in mainline for tools

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

tools

Files:

• config.py (modified) (2 diffs)
• toolchain.sh (modified) (5 diffs)

tools/config.py

@@ -363 +363 @@
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
-        
-        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        timestamp_unix = int(time.time())
+        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
         
         sys.stderr.write("Fetching current revision identifier ... ")
@@ -423 +424 @@
                 outmc.write('#define REVISION %s\n' % revision)
                 defs += ' "-DREVISION=%s"' % revision
+        
+        outmk.write('TIMESTAMP_UNIX = %d\n' % timestamp_unix)
+        outmc.write('#define TIMESTAMP_UNIX %d\n' % timestamp_unix)
+        defs += ' "-DTIMESTAMP_UNIX=%d"\n' % timestamp_unix
         
         outmk.write('TIMESTAMP = %s\n' % timestamp)

tools/toolchain.sh

@@ -36 +36 @@
         GCC_GMP_VERSION_NUM(__GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, __GNU_MP_VERSION_PATCHLEVEL)
 
-#if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2)
+#if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4, 3, 2)
         choke me
 #endif
@@ -58 +58 @@
 GCC_VERSION="4.8.1"
 GCC_PATCHES="toolchain-gcc-4.8.1-targets.patch toolchain-gcc-4.8.1-headers.patch"
-GDB_VERSION="7.6"
+GDB_VERSION="7.6.1"
 GDB_PATCHES="toolchain-gdb-7.6.patch"
 
@@ -273 +273 @@
 }
 
+check_dirs() {
+        OUTSIDE="$1"
+        BASE="$2"
+        ORIGINAL="`pwd`"
+        
+        cd "${OUTSIDE}"
+        check_error $? "Unable to change directory to ${OUTSIDE}."
+        ABS_OUTSIDE="`pwd`"
+        
+        cd "${BASE}"
+        check_error $? "Unable to change directory to ${BASE}."
+        ABS_BASE="`pwd`"
+        
+        cd "${ORIGINAL}"
+        check_error $? "Unable to change directory to ${ORIGINAL}."
+        
+        BASE_LEN="${#ABS_BASE}"
+        OUTSIDE_TRIM="${ABS_OUTSIDE:0:${BASE_LEN}}"
+        
+        if [ "${OUTSIDE_TRIM}" == "${ABS_BASE}" ] ; then
+                echo
+                echo "CROSS_PREFIX cannot reside within the working directory."
+                
+                exit 5
+        fi
+}
+
 unpack_tarball() {
         FILE="$1"
@@ -307 +334 @@
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "33adb18c3048d057ac58d07a3f1adb38"
         download_fetch "${GCC_SOURCE}" "${GCC}" "3b2386c114cd74185aa3754b58a79304"
-        download_fetch "${GDB_SOURCE}" "${GDB}" "fda57170e4d11cdde74259ca575412a8"
+        download_fetch "${GDB_SOURCE}" "${GDB}" "fbc4dab4181e6e9937075b43a4ce2732"
 }
 
@@ -398 +425 @@
         $REAL_INSTALL && create_dir "${PREFIX}" "destination directory"
         create_dir "${OBJDIR}" "GCC object directory"
+        
+        check_dirs "${PREFIX}" "${WORKDIR}"
         
         echo ">>> Unpacking tarballs"