Skip to content

Commit 1891603

Browse files
committed
TESTING illumos-gate: use -mtune=generic
1 parent 79a7337 commit 1891603

File tree

1 file changed

+49
-0
lines changed

1 file changed

+49
-0
lines changed
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From 60395e55a3602e5f1fbf7f77ff4db2bb24485577 Mon Sep 17 00:00:00 2001
2+
From: Aurelien Larcher <aurelien.larcher@gmail.com>
3+
Date: Tue, 24 Mar 2020 01:41:38 +0100
4+
Subject: [PATCH] Use -march=x86-64 -mtune=generic
5+
6+
---
7+
usr/src/lib/libshell/misc/buildksh93.sh | 2 +-
8+
usr/src/tools/cw/cw.c | 5 +++--
9+
2 files changed, 4 insertions(+), 3 deletions(-)
10+
11+
diff --git a/usr/src/lib/libshell/misc/buildksh93.sh b/usr/src/lib/libshell/misc/buildksh93.sh
12+
index d89941d278..3739959854 100644
13+
--- a/usr/src/lib/libshell/misc/buildksh93.sh
14+
+++ b/usr/src/lib/libshell/misc/buildksh93.sh
15+
@@ -356,7 +356,7 @@ function build_shell
16+
*.sparc.64bit.suncc*) HOSTTYPE="sol11.sun4" CC="${bsunc99} -m64 -dalign -KPIC" cc_sharedlib="-G" CCFLAGS="${bsuncc_ccflags}" bsuncc_app_ccflags="${bsuncc_app_ccflags_sparc}" ;;
17+
18+
*.i386.32bit.gcc*) HOSTTYPE="sol11.i386" CC="${bgcc99} -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
19+
- *.i386.64bit.gcc*) HOSTTYPE="sol11.i386" CC="${bgcc99} -m64 -mtune=opteron -Ui386 -U__i386 -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
20+
+ *.i386.64bit.gcc*) HOSTTYPE="sol11.i386" CC="${bgcc99} -m64 -march=x86-64 -mtune=generic -Ui386 -U__i386 -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
21+
*.sparc.32bit.gcc*) HOSTTYPE="sol11.sun4" CC="${bgcc99} -m32 -mcpu=v8 -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
22+
*.sparc.64bit.gcc*) HOSTTYPE="sol11.sun4" CC="${bgcc99} -m64 -mcpu=v9 -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
23+
*.s390.32bit.gcc*) HOSTTYPE="sol11.s390" CC="${bgcc99} -m32 -fPIC" cc_sharedlib="-shared" CCFLAGS="${bgcc_ccflags}" ;;
24+
diff --git a/usr/src/tools/cw/cw.c b/usr/src/tools/cw/cw.c
25+
index 31ba40cb85..6be7a9ae4f 100644
26+
--- a/usr/src/tools/cw/cw.c
27+
+++ b/usr/src/tools/cw/cw.c
28+
@@ -345,7 +345,7 @@ typedef struct xarch_table {
29+
static const xarch_table_t xtbl[] = {
30+
#if defined(__x86)
31+
{ "generic", SS11, {NULL} },
32+
- { "generic64", (SS11|M64), { "-m64", "-mtune=opteron" } },
33+
+ { "generic64", (SS11|M64), { "-m64", "-march=x86-64 -mtune=generic" } },
34+
{ "amd64", (SS11|M64), { "-m64", "-mtune=opteron" } },
35+
{ "386", SS11, { "-march=i386" } },
36+
{ "pentium_pro", SS11, { "-march=pentiumpro" } },
37+
@@ -884,7 +884,8 @@ do_gcc(cw_ictx_t *ctx)
38+
if (strcmp(arg, "-m64") == 0) {
39+
newae(ctx->i_ae, "-m64");
40+
#if defined(__x86)
41+
- newae(ctx->i_ae, "-mtune=opteron");
42+
+ newae(ctx->i_ae, "-march=x86-64");
43+
+ newae(ctx->i_ae, "-mtune=generic");
44+
#endif
45+
mflag |= M64;
46+
break;
47+
--
48+
2.25.0
49+

0 commit comments

Comments
 (0)