commit 032aed9f4b6727bba3b5012d6232544490d35230
author Elliott Hughes <enh@google.com> Wed Apr 17 15:11:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 17 15:11:15 2019 +0000
tree 51ea08110c967e522a6649a81aa928bac97535fc
parent be128f38d697ebb2f1483208eb27540dbdd6a3b4
parent 782c4858807869528577e26f98f68a2c2d0b5977

Merge "Generate assembler system call stubs via genrule."

linker/linker_main.cpp

diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index 6c762a9..f6e4f67 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -467,9 +467,11 @@
 
 #if TIMING
   gettimeofday(&t1, nullptr);
-  PRINT("LINKER TIME: %s: %d microseconds", g_argv[0], (int) (
-           (((long long)t1.tv_sec * 1000000LL) + (long long)t1.tv_usec) -
-           (((long long)t0.tv_sec * 1000000LL) + (long long)t0.tv_usec)));
+  PRINT("LINKER TIME: %s: %d microseconds", g_argv[0],
+        static_cast<int>(((static_cast<long long>(t1.tv_sec) * 1000000LL) +
+                          static_cast<long long>(t1.tv_usec)) -
+                         ((static_cast<long long>(t0.tv_sec) * 1000000LL) +
+                          static_cast<long long>(t0.tv_usec))));
 #endif
 #if STATS
   PRINT("RELO STATS: %s: %d abs, %d rel, %d copy, %d symbol", g_argv[0],

tools/update_version_scripts.sh

diff --git a/tools/update_version_scripts.sh b/tools/update_version_scripts.sh
deleted file mode 100755
index 2c3a5b4..0000000
--- a/tools/update_version_scripts.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR/..
-./libc/tools/genversion-scripts.py
-
-git diff --exit-code HEAD libc/*.map libdl/*.map libm/*.map linker/*.map
-exit $?