From 4c65e4edacf5a9c1b778f127a5160200df6b8b4a Mon Sep 17 00:00:00 2001 From: ketmar Date: Mon, 28 Aug 2023 11:23:06 +0000 Subject: [PATCH] downgraded default profile to core2 FossilOrigin-Name: 5fe55cc97450c451342faf9b7239f968068971d67587e7b2fef3f2630cfeef35 --- sbuild.lua | 32 +++++++++++++++++--------------- xoptz/gnupg.xopt | 4 ++-- xoptz/gnupg2.xopt | 4 ++-- xoptz/libgcrypt.xopt | 4 ++-- xoptz/libgit2.xopt | 2 +- xoptz/lightning.xopt | 27 ++++++++++++++++++++++++--- xoptz/valgrind.xopt | 2 +- 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/sbuild.lua b/sbuild.lua index 6ab6a48..aa8a77a 100755 --- a/sbuild.lua +++ b/sbuild.lua @@ -112,24 +112,24 @@ local optPathList = { -- profiles local defCompOptProfs = { speed = { - CFLAGS = "-O3 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O3 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O3 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O3 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, speedfastmath = { - CFLAGS = "-O3 -march=nehalem -mtune=nehalem -fwrapv -ffast-math -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O3 -march=nehalem -mtune=nehalem -fwrapv -ffast-math -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O3 -march=core2 -mtune=core2 -fwrapv -ffast-math -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O3 -march=core2 -mtune=core2 -fwrapv -ffast-math -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, native = { - CFLAGS = "-O2 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O2 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O2 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O2 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, nativenoalias = { - CFLAGS = "-O2 -march=nehalem -mtune=nehalem -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O2 -march=nehalem -mtune=nehalem -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O2 -march=core2 -mtune=core2 -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O2 -march=core2 -mtune=core2 -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, nativenoaliasopt = { - CFLAGS = "-O3 -march=nehalem -mtune=nehalem -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O3 -march=nehalem -mtune=nehalem -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O3 -march=core2 -mtune=core2 -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O3 -march=core2 -mtune=core2 -fno-strict-aliasing -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, size = { CFLAGS = "-Os -march=i586 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", @@ -149,12 +149,12 @@ local defCompOptProfs = { CXXFLAGS = "", }, nativeo2 = { - CFLAGS = "-O2 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O2 -march=nehalem -mtune=nehalem -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O2 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O2 -march=core2 -mtune=core2 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, nativeemacs = { - CFLAGS = "-O2 -march=nehalem -mtune=nehalem -Wno-pointer-sign -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", - CXXFLAGS = "-O2 -march=nehalem -mtune=nehalem -Wno-pointer-sign -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CFLAGS = "-O2 -march=core2 -mtune=core2 -Wno-pointer-sign -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", + CXXFLAGS = "-O2 -march=core2 -mtune=core2 -Wno-pointer-sign -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", }, nativeo1 = { CFLAGS = "-O1 -fwrapv -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow -mstackrealign", @@ -1587,7 +1587,9 @@ if force_native_profile then --defCompOptProfs.empty = defCompOptProfs.native; -- this, 'cause otherwise some libs (notably, OpenAL) doesn't work with DMD --defCompOptProfs.empty = defCompOptProfs.i586; - defCompOptProfs.empty = defCompOptProfs.haswell; + --defCompOptProfs.empty = defCompOptProfs.haswell; + --defCompOptProfs.empty = defCompOptProfs.nehalem; + defCompOptProfs.empty = defCompOptProfs.core2; --defCompOptProfs.empty = defCompOptProfs.native; end; diff --git a/xoptz/gnupg.xopt b/xoptz/gnupg.xopt index 4e6fdec..8d7c033 100644 --- a/xoptz/gnupg.xopt +++ b/xoptz/gnupg.xopt @@ -1,5 +1,5 @@ -# use `nehalem` to make valgrind happy -profile=nehalem +# use `core2` to make valgrind happy +profile=core2 --enable-silent-rules less verbose build output (undo: "make V=1") --enable-camellia enable the CAMELLIA cipher diff --git a/xoptz/gnupg2.xopt b/xoptz/gnupg2.xopt index e83df44..58f095a 100644 --- a/xoptz/gnupg2.xopt +++ b/xoptz/gnupg2.xopt @@ -1,5 +1,5 @@ -# use `nehalem` to make valgrind happy -profile=nehalem +# use `core2` to make valgrind happy +profile=core2 --enable-silent-rules less verbose build output (undo: "make V=1") --disable-doc do not build the doc program diff --git a/xoptz/libgcrypt.xopt b/xoptz/libgcrypt.xopt index a281695..236037e 100644 --- a/xoptz/libgcrypt.xopt +++ b/xoptz/libgcrypt.xopt @@ -1,5 +1,5 @@ -# use `nehalem` to make valgrind happy -profile=nehalem +# use `core2` to make valgrind happy +profile=core2 --enable-silent-rules less verbose build output (undo: "make V=1") --enable-static=no build static libraries [default=no] diff --git a/xoptz/libgit2.xopt b/xoptz/libgit2.xopt index 252cab5..252b39d 100644 --- a/xoptz/libgit2.xopt +++ b/xoptz/libgit2.xopt @@ -3,7 +3,7 @@ profile=empty #cfg_name="cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_CLAR=OFF -DSTDCALL=OFF -DBUILD_SHARED_LIBS=OFF .." -cfg_name="cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_CLAR=OFF -DSTDCALL=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_TRACE=OFF -DUSE_SSH=OFF -DUSE_HTTPS=OFF .." +cfg_name="cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DBUILD_CLI=OFF -DUSE_THREADS=OFF -DUSE_ICONV=OFF .." !DESC diff --git a/xoptz/lightning.xopt b/xoptz/lightning.xopt index 8c7cfc5..5e22342 100644 --- a/xoptz/lightning.xopt +++ b/xoptz/lightning.xopt @@ -1,8 +1,29 @@ profile=empty - --enable-disassembling make the test programs disassemble the code enabled by default if host != target - --host=i386 -# --enable-assertions perform internal consistency checks +# if we want disasm, we should build everything as a shared library. alas. + +# --disable-disassembler Enable jit disassembler using binutils + --enable-disassembler Enable jit disassembler using binutils + --disable-devel-disassembler Enable extra disassembly options + --disable-devel-get-jit-size Devel mode to regenerate jit size information + --disable-assertions Enable runtime code generation assertions + --disable-devel-strong-type-checking + +# --disable-shared +# --enable-static + + --enable-shared + --disable-static + +#k8: do we need this? +# --host=i386 + + +[preconfigure] +if test ! -x configure; then + ./bootstrap --no-bootstrap-sync --skip-po +fi +[/preconfigure] !DESC diff --git a/xoptz/valgrind.xopt b/xoptz/valgrind.xopt index 0bfad74..937224d 100644 --- a/xoptz/valgrind.xopt +++ b/xoptz/valgrind.xopt @@ -3,7 +3,7 @@ profile=i586 --enable-silent-rules less verbose build output (undo: "make V=1") # --enable-only64bit do a 64-bit only build -# --enable-only32bit do a 32-bit only build + --enable-only32bit do a 32-bit only build # --enable-inner enables self-hosting --disable-ubsan enables the undefined behaviour sanitiser --disable-lto enables building with link time optimisation -- 2.11.4.GIT