From f46f81bd9aedf385303cc7d5eeecb47397d8c273 Mon Sep 17 00:00:00 2001 From: rin Date: Tue, 13 Oct 2020 06:49:27 +0000 Subject: [PATCH] Now, profiling works for GCC9 on aarch64{,eb}. Note that it seems to work even for GCC8, according to log data of official test runs, e.g., https://releng.netbsd.org/b5reports/evbarm-aarch64/2020/2020.09.01.15.45.20/test.log --- tests/usr.bin/c++/t_call_once.sh | 12 +----------- tests/usr.bin/c++/t_cxxruntime.sh | 12 +----------- tests/usr.bin/c++/t_hello.sh | 12 +----------- tests/usr.bin/c++/t_pthread_once.sh | 12 +----------- tests/usr.bin/c++/t_static_destructor.sh | 12 +----------- tests/usr.bin/cc/t_hello.sh | 7 +------ 6 files changed, 6 insertions(+), 61 deletions(-) diff --git a/tests/usr.bin/c++/t_call_once.sh b/tests/usr.bin/c++/t_call_once.sh index 77d36c173e56..e080d6af8c95 100644 --- a/tests/usr.bin/c++/t_call_once.sh +++ b/tests/usr.bin/c++/t_call_once.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_call_once.sh,v 1.3 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_call_once.sh,v 1.4 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2018 The NetBSD Foundation, Inc. # All rights reserved. @@ -112,11 +112,6 @@ int main(void) { } EOF atf_check -s exit:0 -o ignore -e ignore c++ -pg -o call_once test.cpp -pthread - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once } @@ -233,11 +228,6 @@ EOF atf_check -s exit:0 -o ignore -e ignore \ c++ -pg -o call_once test.cpp -L. -ltest -pthread - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac export LD_LIBRARY_PATH=. atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once } diff --git a/tests/usr.bin/c++/t_cxxruntime.sh b/tests/usr.bin/c++/t_cxxruntime.sh index 07ce011f5fe0..45140812ce0c 100644 --- a/tests/usr.bin/c++/t_cxxruntime.sh +++ b/tests/usr.bin/c++/t_cxxruntime.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_cxxruntime.sh,v 1.4 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_cxxruntime.sh,v 1.5 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2017 The NetBSD Foundation, Inc. # All rights reserved. @@ -105,11 +105,6 @@ cxxruntime_profile_body() { int main(void) {std::cout << "hello world" << std::endl;exit(0);} EOF atf_check -s exit:0 -o ignore -e ignore c++ -pg -o hello test.cpp - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"hello world\n" ./hello } @@ -213,11 +208,6 @@ EOF atf_check -s exit:0 -o ignore -e ignore \ c++ -pg -o hello test.cpp -L. -ltest - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac export LD_LIBRARY_PATH=. atf_check -s exit:0 -o inline:"hello world\n" ./hello } diff --git a/tests/usr.bin/c++/t_hello.sh b/tests/usr.bin/c++/t_hello.sh index e48ae240465a..5fa89de87ee3 100644 --- a/tests/usr.bin/c++/t_hello.sh +++ b/tests/usr.bin/c++/t_hello.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_hello.sh,v 1.4 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_hello.sh,v 1.5 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -102,11 +102,6 @@ hello_profile_body() { int main(void) {printf("hello world\n");exit(0);} EOF atf_check -s exit:0 -o ignore -e ignore c++ -pg -o hello test.cpp - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"hello world\n" ./hello } @@ -208,11 +203,6 @@ EOF atf_check -s exit:0 -o ignore -e ignore \ c++ -pg -o hello test.cpp -L. -ltest - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac export LD_LIBRARY_PATH=. atf_check -s exit:0 -o inline:"hello world\n" ./hello } diff --git a/tests/usr.bin/c++/t_pthread_once.sh b/tests/usr.bin/c++/t_pthread_once.sh index afaa2edf2867..57280d304dbc 100644 --- a/tests/usr.bin/c++/t_pthread_once.sh +++ b/tests/usr.bin/c++/t_pthread_once.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_pthread_once.sh,v 1.3 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_pthread_once.sh,v 1.4 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2018 The NetBSD Foundation, Inc. # All rights reserved. @@ -110,11 +110,6 @@ int main(void) { } EOF atf_check -s exit:0 -o ignore -e ignore c++ -pg -o pthread_once test.cpp -pthread - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once } @@ -227,11 +222,6 @@ EOF atf_check -s exit:0 -o ignore -e ignore \ c++ -pg -o pthread_once test.cpp -L. -ltest -pthread - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac export LD_LIBRARY_PATH=. atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once } diff --git a/tests/usr.bin/c++/t_static_destructor.sh b/tests/usr.bin/c++/t_static_destructor.sh index 695b5cdb8b94..811ad6f02ab6 100644 --- a/tests/usr.bin/c++/t_static_destructor.sh +++ b/tests/usr.bin/c++/t_static_destructor.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_static_destructor.sh,v 1.3 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_static_destructor.sh,v 1.4 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2017 The NetBSD Foundation, Inc. # All rights reserved. @@ -123,11 +123,6 @@ struct B { int main(void) {struct B b;return 0;} EOF atf_check -s exit:0 -o ignore -e ignore c++ -pg -o hello test.cpp - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"CTOR A\nCTOR B\nDTOR B:10\nDTOR A:20\n" ./hello } @@ -280,11 +275,6 @@ EOF atf_check -s exit:0 -o ignore -e ignore \ c++ -pg -o hello test.cpp -L. -ltest - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac export LD_LIBRARY_PATH=. atf_check -s exit:0 -o inline:"CTOR A\nCTOR B\nDTOR B:10\nDTOR A:20\n" ./hello } diff --git a/tests/usr.bin/cc/t_hello.sh b/tests/usr.bin/cc/t_hello.sh index d7823184e5dd..f87bd5b4d50b 100644 --- a/tests/usr.bin/cc/t_hello.sh +++ b/tests/usr.bin/cc/t_hello.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_hello.sh,v 1.9 2020/02/11 06:26:19 riastradh Exp $ +# $NetBSD: t_hello.sh,v 1.10 2020/10/13 06:49:27 rin Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -72,11 +72,6 @@ hello_profile_body() { int main(void) {printf("hello world\n");exit(0);} EOF atf_check -s exit:0 -o ignore -e ignore cc -o hello -pg test.c - case `uname -p` in - aarch64) - atf_expect_fail 'cc -pg is busted on aarch64' - ;; - esac atf_check -s exit:0 -o inline:"hello world\n" ./hello atf_check -s exit:0 -o ignore -e ignore cc -o hello2 -fprofile-generate test.c atf_check -s exit:0 -o inline:"hello world\n" ./hello2