From 6989aea9460557bf0d4aec4681ea73f0a05cfd96 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Thu, 24 Nov 2022 11:22:37 +0900 Subject: use CXX instead of g++ --- test/test_avx512.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_avx512.sh') diff --git a/test/test_avx512.sh b/test/test_avx512.sh index 17edfee..e110d64 100755 --- a/test/test_avx512.sh +++ b/test/test_avx512.sh @@ -20,7 +20,7 @@ esac CFLAGS="-Wall -fno-operator-names -I../ $OPT2 -DUSE_AVX512" echo "compile make_512.cpp" -g++ $CFLAGS make_512.cpp -o make_512 +$CXX $CFLAGS make_512.cpp -o make_512 ./make_512 > a.asm echo "asm" @@ -30,6 +30,6 @@ awk '{printf "%s", sub(/-$/, "", $3) ? $3 : $3 ORS}' a.lst | $FILTER > ok.lst echo "xbyak" ./make_512 jit > nm.cpp echo "compile nm_frame.cpp" -g++ $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame -DXBYAK_AVX512 +$CXX $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame -DXBYAK_AVX512 ./nm_frame | $FILTER > x.lst diff -B ok.lst x.lst && echo "ok" -- cgit v1.2.3 From bc73a081642f89d6ffc8442a3c8f86ac24ca2729 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Thu, 24 Nov 2022 11:40:50 +0900 Subject: remove -fno-operator-names option --- gen/Makefile | 2 +- test/Makefile | 4 ++-- test/test_address.sh | 2 +- test/test_avx.sh | 2 +- test/test_avx512.sh | 2 +- test/test_nm.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/test_avx512.sh') diff --git a/gen/Makefile b/gen/Makefile index 97a6846..f254d71 100644 --- a/gen/Makefile +++ b/gen/Makefile @@ -1,6 +1,6 @@ TARGET=../xbyak/xbyak_mnemonic.h BIN=sortline gen_code gen_avx512 -CFLAGS=-I../ -O2 -DXBYAK_NO_OP_NAMES -Wall -Wextra -Wno-missing-field-initializers $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) +CFLAGS=-I../ -O2 -Wall -Wextra -Wno-missing-field-initializers $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) all: $(TARGET) ../CMakeLists.txt ../meson.build ../readme.md ../readme.txt sortline: sortline.cpp $(CXX) $(CFLAGS) $< -o $@ diff --git a/test/Makefile b/test/Makefile index ce7bb2f..296b0bf 100644 --- a/test/Makefile +++ b/test/Makefile @@ -23,9 +23,9 @@ endif all: $(TARGET) -CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wfloat-equal -Wpointer-arith +CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wwrite-strings -Wfloat-equal -Wpointer-arith -CFLAGS=-O2 -fomit-frame-pointer -Wall -fno-operator-names -I../ -I./ $(CFLAGS_WARN) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) #-std=c++0x +CFLAGS=-O2 -Wall -I../ -I./ $(CFLAGS_WARN) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) #-std=c++0x make_nm: $(CXX) $(CFLAGS) make_nm.cpp -o $@ normalize_prefix: normalize_prefix.cpp ../xbyak/xbyak.h diff --git a/test/test_address.sh b/test/test_address.sh index 413a2dd..cbe088e 100755 --- a/test/test_address.sh +++ b/test/test_address.sh @@ -5,7 +5,7 @@ FILTER="grep -v warning" sub() { -CFLAGS="-Wall -fno-operator-names -I../ $OPT2" +CFLAGS="-Wall -I../ $OPT2" echo "compile address.cpp" $CXX $CFLAGS address.cpp -o address diff --git a/test/test_avx.sh b/test/test_avx.sh index e949111..07008e0 100755 --- a/test/test_avx.sh +++ b/test/test_avx.sh @@ -31,7 +31,7 @@ Y64) ;; esac -CFLAGS="-Wall -fno-operator-names -I../ $OPT2 -DUSE_AVX" +CFLAGS="-Wall -I../ $OPT2 -DUSE_AVX" echo "compile make_nm.cpp" $CXX $CFLAGS make_nm.cpp -o make_nm diff --git a/test/test_avx512.sh b/test/test_avx512.sh index e110d64..736e142 100755 --- a/test/test_avx512.sh +++ b/test/test_avx512.sh @@ -18,7 +18,7 @@ case $1 in ;; esac -CFLAGS="-Wall -fno-operator-names -I../ $OPT2 -DUSE_AVX512" +CFLAGS="-Wall -I../ $OPT2 -DUSE_AVX512" echo "compile make_512.cpp" $CXX $CFLAGS make_512.cpp -o make_512 diff --git a/test/test_nm.sh b/test/test_nm.sh index 06f80fb..0751149 100755 --- a/test/test_nm.sh +++ b/test/test_nm.sh @@ -44,7 +44,7 @@ noexcept) ;; esac -CFLAGS="-Wall -fno-operator-names -I../ $OPT2" +CFLAGS="-Wall -I../ $OPT2" echo "compile make_nm.cpp with $CFLAGS" $CXX $CFLAGS make_nm.cpp -o make_nm -- cgit v1.2.3 From bafc1ee60f37ebdb27ea27cb92690070b76128d2 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Thu, 24 Nov 2022 12:01:25 +0900 Subject: CXX uses g++ as default value --- test/test_address.sh | 2 ++ test/test_avx.sh | 1 + test/test_avx512.sh | 1 + test/test_nm.sh | 1 + 4 files changed, 5 insertions(+) (limited to 'test/test_avx512.sh') diff --git a/test/test_address.sh b/test/test_address.sh index cbe088e..7960700 100755 --- a/test/test_address.sh +++ b/test/test_address.sh @@ -6,6 +6,8 @@ sub() { CFLAGS="-Wall -I../ $OPT2" +CXX=${CXX:=g++} + echo "compile address.cpp" $CXX $CFLAGS address.cpp -o address diff --git a/test/test_avx.sh b/test/test_avx.sh index 07008e0..35087cd 100755 --- a/test/test_avx.sh +++ b/test/test_avx.sh @@ -1,6 +1,7 @@ #!/bin/sh FILTER="grep -v warning" +CXX=${CXX:=g++} case $1 in Y) diff --git a/test/test_avx512.sh b/test/test_avx512.sh index 736e142..90d14df 100755 --- a/test/test_avx512.sh +++ b/test/test_avx512.sh @@ -1,6 +1,7 @@ #!/bin/sh FILTER="grep -v warning" +CXX=${CXX:=g++} case $1 in 64) diff --git a/test/test_nm.sh b/test/test_nm.sh index 0751149..019f278 100755 --- a/test/test_nm.sh +++ b/test/test_nm.sh @@ -1,6 +1,7 @@ #!/bin/sh FILTER=cat +CXX=${CXX:=g++} case $1 in Y) -- cgit v1.2.3