Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update --with-isa-spec default option. #1229

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Conversation

pz9115
Copy link
Contributor

@pz9115 pz9115 commented Apr 17, 2023

Update --with-isa-spec default option to 20191213, also adjust the text format.

Copy link
Collaborator

@cmuellner cmuellner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for me.

@kito-cheng
Copy link
Collaborator

Plz run autoconf instead of manually adjust configure script.

@pz9115
Copy link
Contributor Author

pz9115 commented Apr 17, 2023

Plz run autoconf instead of manually adjust configure script.

Thanks for your reminder, after run autoconfig with the new configure.ac, there generated
additional options --with-dejagnu-src, I'm not sure where goes wrong, any suggestions?

--- a/configure
+++ b/configure
@@ -587,8 +587,8 @@ LIBOBJS
 qemu_targets
 enable_libsanitizer
 with_linux_headers_src
-with_pk_src
 with_dejagnu_src
+with_pk_src
 with_spike_src
 with_qemu_src
 with_gdb_src
@@ -1350,8 +1350,9 @@ Optional Packages:
   --with-arch=rv64imafdc  Sets the base RISC-V ISA, defaults to rv64imafdc
   --with-abi=lp64d        Sets the base RISC-V ABI, defaults to lp64d
   --with-tune=rocket      Set the base RISC-V CPU, defaults to rocket
-  --with-isa-spec=2.2     Set the default ISA spec version, default to 2.2,
-                          available options: 2.2, 20190608, 20191213
+  --with-isa-spec=20191213
+                          Set the default ISA spec version, default to
+                          20191213, available options: 2.2, 20190608, 20191213
   --with-sim=qemu         Sets the base RISC-V Simulator, defaults to qemu
   --with-multilib-generator
                           Multi-libs configuration string, only supported for
@@ -1377,6 +1378,8 @@ Optional Packages:
   --with-qemu-src         Set qemu source path, use builtin source by default
   --with-spike-src        Set spike source path, use builtin source by default
   --with-pk-src           Set pk source path, use builtin source by default
+  --with-dejagnu-src      Set dejagnu source path, use builtin source by
+                          default
   --with-linux-headers-src
                           Set linux-headers source path, use builtin source by
                           default
@@ -3328,7 +3331,7 @@ fi
 if test "${with_isa_spec+set}" = set; then :
   withval=$with_isa_spec;
 else
-  with_isa_spec=2.2
+  with_isa_spec=20191213
 
 fi
 
@@ -3731,7 +3734,6 @@ else
 fi
 
        }
-
 {
 
 # Check whether --with-dejagnu-src was given.
diff --git a/configure.ac b/configure.ac
index b838b64..ead25e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,10 +72,10 @@ AC_ARG_WITH(tune,
        )
 
 AC_ARG_WITH(isa-spec,
-       [AS_HELP_STRING([--with-isa-spec=2.2],
-               [Set the default ISA spec version, default to 2.2, available options: 2.2, 20190608, 20191213])
],
+       [AS_HELP_STRING([--with-isa-spec=20191213],
+               [Set the default ISA spec version, default to 20191213, available options: 2.2, 20190608, 20191
213])],
        [],
-       [with_isa_spec=2.2]
+       [with_isa_spec=20191213]
        )

@kito-cheng
Copy link
Collaborator

@pz9115 it seems like we also manually edit that before...commit that version is fine to me.

Copy link
Collaborator

@kito-cheng kito-cheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kito-cheng kito-cheng merged commit cc3263a into riscv-collab:master Apr 17, 2023
cmuellner pushed a commit that referenced this pull request May 11, 2023
Default ISA spec version was bumped to 20191213 in
0ae36fc (#1229)
but it's not reflected in README.md.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants