temporary

main.cc

@@ -814,6 +814,8 @@ int main(int argc, char **argv) {
       config.rpaths.push_back(arg);
     } else if (read_arg(args, arg, "version-script")) {
       parse_version_script(arg);
+    } else if (read_flag(args, "perf")) {
+      config.perf = true;
     } else if (read_arg(args, arg, "l")) {
       read_file(find_library(arg));
     } else if (read_arg(args, arg, "z")) {
@@ -1110,7 +1112,12 @@ int main(int argc, char **argv) {
   Counter num_dsos("num_dsos", out::dsos.size());
   Counter filesize_counter("filesize", filesize);
 
-  Counter::print();
-  Timer::print();
+  if (Counter::enabled)
+    Counter::print();
+  if (config.perf)
+    Timer::print();
+
+  std::cout << std::flush;
+  std::cerr << std::flush;
   _exit(0);
 }

mold.h

@@ -55,6 +55,7 @@ struct Config {
   bool as_needed = false;
   bool export_dynamic = false;
   bool is_static = false;
+  bool perf = false;
   bool print_map = false;
   bool trace = false;
   int filler = -1;

perf.cc

@@ -6,7 +6,7 @@
 #include <sys/time.h>
 
 std::vector<Counter *> Counter::instances;
-bool Counter::enabled = true;
+bool Counter::enabled = false;
 
 std::vector<Timer *> Timer::instances;
 

test/as-needed.sh

@@ -19,13 +19,13 @@ cat <<EOF | cc -o $t/c.so -shared -fPIC -Wl,-soname,libbar.so -xc -
 int fn2() { return 42; }
 EOF
 
-../mold -o $t/exe $t/a.o $t/b.so $t/c.so > /dev/null
+../mold -o $t/exe $t/a.o $t/b.so $t/c.so
 
 readelf --dynamic $t/exe > $t/readelf
 fgrep -q 'Shared library: [libfoo.so]' $t/readelf
 fgrep -q 'Shared library: [libbar.so]' $t/readelf
 
-../mold -o $t/exe $t/a.o --as-needed $t/b.so $t/c.so > /dev/null
+../mold -o $t/exe $t/a.o --as-needed $t/b.so $t/c.so
 
 readelf --dynamic $t/exe > $t/readelf
 fgrep -q 'Shared library: [libfoo.so]' $t/readelf

test/basic.sh

@@ -6,7 +6,7 @@ mkdir -p $t
 
 echo '.globl _start; _start: jmp loop' | cc -o $t/a.o -c -x assembler -
 echo '.globl loop; loop: jmp loop' | cc -o $t/b.o -c -x assembler -
-../mold -static -o $t/exe $t/a.o $t/b.o > /dev/null
+../mold -static -o $t/exe $t/a.o $t/b.o
 objdump -d $t/exe > /dev/null
 file $t/exe | grep -q ELF
 

test/copyrel.sh

@@ -34,7 +34,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q '42 42 1'
 

test/filler.sh

@@ -28,7 +28,7 @@ EOF
   /usr/lib/gcc/x86_64-linux-gnu/9/libgcc_eh.a \
   /usr/lib/x86_64-linux-gnu/libc.a \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 ../mold -static --filler 0x0 -o $t/exe2 \
   /usr/lib/x86_64-linux-gnu/crt1.o \
@@ -39,7 +39,7 @@ EOF
   /usr/lib/gcc/x86_64-linux-gnu/9/libgcc_eh.a \
   /usr/lib/x86_64-linux-gnu/libc.a \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 hexdump -C $t/exe1 > $t/txt1
 hexdump -C $t/exe2 > $t/txt2

test/hello-dynamic.sh

@@ -29,7 +29,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/hello-static.sh

@@ -27,7 +27,7 @@ EOF
   /usr/lib/gcc/x86_64-linux-gnu/9/libgcc_eh.a \
   /usr/lib/x86_64-linux-gnu/libc.a \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/ifunc-dso.sh

@@ -53,7 +53,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/ifunc-dynamic.sh

@@ -50,7 +50,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/ifunc-static.sh

@@ -49,7 +49,7 @@ EOF
   /usr/lib/gcc/x86_64-linux-gnu/9/libgcc_eh.a \
   /usr/lib/x86_64-linux-gnu/libc.a \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/library-path-dynamic.sh

@@ -46,7 +46,7 @@ EOF
   -lgcc_s \
   --no-as-needed \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/library-path-static.sh

@@ -40,7 +40,7 @@ EOF
   -lgcc_eh \
   -lc \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/linker-script.sh

@@ -35,7 +35,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libgcc_s.so.1 \
   $t/script \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/mergeable-strings.sh

@@ -32,7 +32,7 @@ EOF
   /usr/lib/gcc/x86_64-linux-gnu/9/libgcc_eh.a \
   /usr/lib/x86_64-linux-gnu/libc.a \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q 'Hello world'
 

test/missing-but-ok.sh

@@ -11,6 +11,6 @@ _start:
   nop
 EOF
 
-../mold -o $t/exe $t/a.o > /dev/null
+../mold -o $t/exe $t/a.o
 
 echo ' OK'

test/symtab.sh

@@ -18,7 +18,7 @@ local2:
 this_is_global:
 EOF
 
-../mold -o $t/exe $t/a.o $t/b.o > /dev/null
+../mold -o $t/exe $t/a.o $t/b.o
 
 readelf --symbols $t/exe | grep -q "
 Symbol table '.symtab' contains 21 entries:

test/tls-gd.sh

@@ -35,7 +35,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q '3 5 3 5'
 

test/tls-ld.sh

@@ -35,7 +35,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q '3 5 3 5'
 

test/tls-nopic.sh

@@ -36,7 +36,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q '3 5 3 5'
 

test/tls-pic.sh

@@ -35,7 +35,7 @@ EOF
   /usr/lib/x86_64-linux-gnu/libc_nonshared.a \
   /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 \
   /usr/lib/gcc/x86_64-linux-gnu/9/crtend.o \
-  /usr/lib/x86_64-linux-gnu/crtn.o > /dev/null
+  /usr/lib/x86_64-linux-gnu/crtn.o
 
 $t/exe | grep -q '3 5 3 5'
 

test/weak-export.sh

@@ -12,7 +12,7 @@ _start:
 EOF
 
 
-../mold -o $t/exe $t/a.o > /dev/null
+../mold -o $t/exe $t/a.o
 readelf -a $t/exe > /dev/null
 
 echo ' OK'