Skip to content

Commit 7c07a87

Browse files
Update glibc and newlib paths
Both the glibc and newlib submodules are already pointing to the upstream repositories where development happens. Since they are therefore not referring to RISC-V specific forks, this patch unifies the directory naming by only prepending the "riscv-" prefix to submodules that point to repositories in the riscv-collab Github organization. Signed-off-by: Florian Hofhammer <florian.hofhammer@fhofhammer.de>
1 parent 63f696c commit 7c07a87

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
path = riscv-gcc
77
url = https://github.com/riscv-collab/riscv-gcc.git
88
branch = riscv-gcc-10.2.0
9-
[submodule "riscv-glibc"]
10-
path = riscv-glibc
9+
[submodule "glibc"]
10+
path = glibc
1111
url = git://sourceware.org/git/glibc.git
1212
[submodule "riscv-dejagnu"]
1313
path = riscv-dejagnu
1414
url = https://github.com/riscv-collab/riscv-dejagnu.git
1515
branch = riscv-dejagnu-1.6
16-
[submodule "riscv-newlib"]
17-
path = riscv-newlib
16+
[submodule "newlib"]
17+
path = newlib
1818
url = git://sourceware.org/git/newlib-cygwin.git
1919
branch = master
2020
[submodule "riscv-gdb"]

configure

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3558,7 +3558,7 @@ fi
35583558
with_newlib_src=$with_newlib_src
35593559
35603560
else
3561-
with_newlib_src="\$(srcdir)/riscv-newlib"
3561+
with_newlib_src="\$(srcdir)/newlib"
35623562
35633563
fi
35643564
@@ -3577,7 +3577,7 @@ fi
35773577
with_glibc_src=$with_glibc_src
35783578
35793579
else
3580-
with_glibc_src="\$(srcdir)/riscv-glibc"
3580+
with_glibc_src="\$(srcdir)/glibc"
35813581
35823582
fi
35833583
@@ -4820,4 +4820,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
48204820
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
48214821
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
48224822
fi
4823-

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ AC_DEFUN([AX_ARG_WITH_SRC],
217217

218218
AX_ARG_WITH_SRC(gcc, riscv-gcc)
219219
AX_ARG_WITH_SRC(binutils, riscv-binutils)
220-
AX_ARG_WITH_SRC(newlib, riscv-newlib)
221-
AX_ARG_WITH_SRC(glibc, riscv-glibc)
220+
AX_ARG_WITH_SRC(newlib, newlib)
221+
AX_ARG_WITH_SRC(glibc, glibc)
222222
AX_ARG_WITH_SRC(musl, riscv-musl)
223223
AX_ARG_WITH_SRC(gdb, riscv-gdb)
224224
AX_ARG_WITH_SRC(qemu, qemu)

riscv-glibc renamed to glibc

Submodule glibc updated from 0000000 to 9826b03

riscv-newlib renamed to newlib

Submodule newlib updated from 0000000 to 415fdd4

0 commit comments

Comments
 (0)