Skip to content

Commit 8aafa2e

Browse files
TelGomeDongyan Chen
authored andcommitted
Update configure
Since the patch "RISC-V: Add generic tune as default" has been commited into the trunk, the configure should also been updated. Here is the link: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=20f593018519fec1602dc39c08ba2e674a2d8a1c Signed-off-by: TelGome <93700071+TelGome@users.noreply.github.com>
1 parent 062ad35 commit 8aafa2e

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

configure

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ Optional Packages:
14001400
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
14011401
--with-arch=rv64gc Sets the base RISC-V ISA, defaults to rv64gc
14021402
--with-abi=lp64d Sets the base RISC-V ABI, defaults to lp64d
1403-
--with-tune=rocket Set the base RISC-V CPU, defaults to rocket
1403+
--with-tune=generic Set the base RISC-V CPU, defaults to GCC's default
14041404
--with-isa-spec=20191213
14051405
Set the default ISA spec version, default to
14061406
20191213, available options: 2.2, 20190608, 20191213
@@ -4014,12 +4014,17 @@ fi
40144014
if test ${with_tune+y}
40154015
then :
40164016
withval=$with_tune;
4017-
else $as_nop
4018-
with_tune=rocket
40194017
40204018
fi
40214019
40224020
4021+
if test "x$with_tune" != "x"; then
4022+
WITH_TUNE="--with-tune=$with_tune"
4023+
else
4024+
WITH_TUNE=""
4025+
4026+
fi
4027+
40234028
40244029
# Check whether --with-isa-spec was given.
40254030
if test ${with_isa_spec+y}
@@ -4078,7 +4083,6 @@ WITH_ARCH=--with-arch=$with_arch
40784083
40794084
WITH_ABI=--with-abi=$with_abi
40804085
4081-
WITH_TUNE=--with-tune=$with_tune
40824086
40834087
WITH_ISA_SPEC=--with-isa-spec=$with_isa_spec
40844088

configure.ac

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,18 @@ AC_ARG_WITH(abi,
9494
)
9595

9696
AC_ARG_WITH(tune,
97-
[AS_HELP_STRING([--with-tune=rocket],
98-
[Set the base RISC-V CPU, defaults to rocket])],
99-
[],
100-
[with_tune=rocket]
97+
[AS_HELP_STRING([--with-tune=generic],
98+
[Set the base RISC-V CPU, defaults to GCC's default])],
99+
[]
101100
)
102101

102+
if test "x$with_tune" != "x"; then
103+
WITH_TUNE="--with-tune=$with_tune"
104+
else
105+
WITH_TUNE=""
106+
107+
fi
108+
103109
AC_ARG_WITH(isa-spec,
104110
[AS_HELP_STRING([--with-isa-spec=20191213],
105111
[Set the default ISA spec version, default to 20191213, available options: 2.2, 20190608, 20191213])],
@@ -134,7 +140,7 @@ AS_IF([test "x$with_abi" = xdefault],
134140

135141
AC_SUBST(WITH_ARCH, --with-arch=$with_arch)
136142
AC_SUBST(WITH_ABI, --with-abi=$with_abi)
137-
AC_SUBST(WITH_TUNE, --with-tune=$with_tune)
143+
AC_SUBST(WITH_TUNE)
138144
AC_SUBST(WITH_ISA_SPEC, --with-isa-spec=$with_isa_spec)
139145
AC_SUBST(WITH_SIM, $with_sim)
140146
AC_SUBST(WITH_LANGUAGES, $with_languages)

0 commit comments

Comments
 (0)