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.

Sign up for GitHub

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

Jump to bottom

Update configure.ac and sync configure. #1594

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update configure.ac and sync configure. #1594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb76a8
Update configure.ac and sync configure.
pz9115 Oct 24, 2024
c58b9cf
Remove redundant information in configure.ac.
pz9115 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,8 +1384,8 @@ Optional Features:
information
--enable-default-pie build linux toolchain with default PIE
[--enable-default-pie]
--enable-multilib build both RV32 and RV64 runtime libraries
[--disable-multilib]
--enable-multilib build both RV32 and RV64 runtime libraries (only
RV64 for musl libc) [--disable-multilib]
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is caused by a forgotten change in configure.ac.
Can you update configure.ac?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, the new configure file is just generated by $ autoconf configure.ac :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

I got that, but with this PR we end up with a wrong message in configure.
So, please fix configure.ac (remove the "only RV64 for musl libc" there).

--enable-gcc-checking Enable gcc internal checking, it will make gcc very
slow, only enable it when developing gcc
[--disable-gcc-checking]
Expand Down Expand Up @@ -4166,7 +4166,7 @@ fi

if test "x$enable_multilib" != xno
then :
musl_multilib_names="rv64imac-lp64 rv64imafdc-lp64d"
musl_multilib_names="rv32imac-ilp32 rv32imafdc-ilp32d rv64imac-lp64 rv64imafdc-lp64d"
cmuellner marked this conversation as resolved.
Show resolved Hide resolved

else $as_nop
musl_multilib_names="$with_arch-$with_abi"
Expand Down
11 changes: 4 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Process this file with autoconf 2.69. Other versions may not work.
AC_INIT(riscv-toolchain, 1.0)
AC_INIT([riscv-toolchain],[1.0])

AC_PROG_CC
AC_PROG_FGREP
Expand Down Expand Up @@ -246,8 +246,7 @@ AS_IF([test "x$with_system_zlib" != xno],
[AC_SUBST(with_system_zlib,--without-system-zlib)])

AC_ARG_WITH(guile,
[AC_HELP_STRING([--with-guile],
[Set which guile to use, if any])],
[AS_HELP_STRING([--with-guile],[Set which guile to use, if any])],
[],
[with_guile=default]
)
Expand Down Expand Up @@ -291,8 +290,7 @@ AS_IF([test "x$enable_host_gcc" != xyes],
AC_DEFUN([AX_ARG_WITH_SRC],
[{m4_pushdef([opt_name], with_$1_src)
AC_ARG_WITH($1-src,
[AC_HELP_STRING([--with-$1-src],
[Set $1 source path, use builtin source by default])],
[AS_HELP_STRING([--with-$1-src],[Set $1 source path, use builtin source by default])],
[],
[opt_name=default]
)
Expand All @@ -316,8 +314,7 @@ AX_ARG_WITH_SRC(llvm, llvm)
AX_ARG_WITH_SRC(dejagnu, dejagnu)

AC_ARG_WITH(linux-headers-src,
[AC_HELP_STRING([--with-linux-headers-src],
[Set linux-headers source path, use builtin source by default])],
[AS_HELP_STRING([--with-linux-headers-src],[Set linux-headers source path, use builtin source by default])],
[],
[with_linux_headers_src=default]
)
Expand Down
Loading