diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/endianness.h b/lib/libc/include/riscv32-linux-gnu/bits/endianness.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/endianness.h
rename to lib/libc/include/riscv32-linux-gnu/bits/endianness.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/environments.h b/lib/libc/include/riscv32-linux-gnu/bits/environments.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/environments.h
rename to lib/libc/include/riscv32-linux-gnu/bits/environments.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/fcntl.h b/lib/libc/include/riscv32-linux-gnu/bits/fcntl.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/fcntl.h
rename to lib/libc/include/riscv32-linux-gnu/bits/fcntl.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/fenv.h b/lib/libc/include/riscv32-linux-gnu/bits/fenv.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/fenv.h
rename to lib/libc/include/riscv32-linux-gnu/bits/fenv.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/floatn.h b/lib/libc/include/riscv32-linux-gnu/bits/floatn.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/floatn.h
rename to lib/libc/include/riscv32-linux-gnu/bits/floatn.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/link.h b/lib/libc/include/riscv32-linux-gnu/bits/link.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/link.h
rename to lib/libc/include/riscv32-linux-gnu/bits/link.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/long-double.h b/lib/libc/include/riscv32-linux-gnu/bits/long-double.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/long-double.h
rename to lib/libc/include/riscv32-linux-gnu/bits/long-double.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/procfs.h b/lib/libc/include/riscv32-linux-gnu/bits/procfs.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/procfs.h
rename to lib/libc/include/riscv32-linux-gnu/bits/procfs.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/pthreadtypes-arch.h b/lib/libc/include/riscv32-linux-gnu/bits/pthreadtypes-arch.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/pthreadtypes-arch.h
rename to lib/libc/include/riscv32-linux-gnu/bits/pthreadtypes-arch.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/rseq.h b/lib/libc/include/riscv32-linux-gnu/bits/rseq.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/rseq.h
rename to lib/libc/include/riscv32-linux-gnu/bits/rseq.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/setjmp.h b/lib/libc/include/riscv32-linux-gnu/bits/setjmp.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/setjmp.h
rename to lib/libc/include/riscv32-linux-gnu/bits/setjmp.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/sigcontext.h b/lib/libc/include/riscv32-linux-gnu/bits/sigcontext.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/sigcontext.h
rename to lib/libc/include/riscv32-linux-gnu/bits/sigcontext.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/struct_rwlock.h b/lib/libc/include/riscv32-linux-gnu/bits/struct_rwlock.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/struct_rwlock.h
rename to lib/libc/include/riscv32-linux-gnu/bits/struct_rwlock.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/struct_stat.h b/lib/libc/include/riscv32-linux-gnu/bits/struct_stat.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/struct_stat.h
rename to lib/libc/include/riscv32-linux-gnu/bits/struct_stat.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/time64.h b/lib/libc/include/riscv32-linux-gnu/bits/time64.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/time64.h
rename to lib/libc/include/riscv32-linux-gnu/bits/time64.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/timesize.h b/lib/libc/include/riscv32-linux-gnu/bits/timesize.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/timesize.h
rename to lib/libc/include/riscv32-linux-gnu/bits/timesize.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/typesizes.h b/lib/libc/include/riscv32-linux-gnu/bits/typesizes.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/typesizes.h
rename to lib/libc/include/riscv32-linux-gnu/bits/typesizes.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/wordsize.h b/lib/libc/include/riscv32-linux-gnu/bits/wordsize.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/bits/wordsize.h
rename to lib/libc/include/riscv32-linux-gnu/bits/wordsize.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/fpu_control.h b/lib/libc/include/riscv32-linux-gnu/fpu_control.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/fpu_control.h
rename to lib/libc/include/riscv32-linux-gnu/fpu_control.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names-ilp32.h
rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names.h
rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs-ilp32.h
rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs.h
rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/ieee754.h b/lib/libc/include/riscv32-linux-gnu/ieee754.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/ieee754.h
rename to lib/libc/include/riscv32-linux-gnu/ieee754.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/asm.h b/lib/libc/include/riscv32-linux-gnu/sys/asm.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/sys/asm.h
rename to lib/libc/include/riscv32-linux-gnu/sys/asm.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/cachectl.h b/lib/libc/include/riscv32-linux-gnu/sys/cachectl.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/sys/cachectl.h
rename to lib/libc/include/riscv32-linux-gnu/sys/cachectl.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/ucontext.h b/lib/libc/include/riscv32-linux-gnu/sys/ucontext.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/sys/ucontext.h
rename to lib/libc/include/riscv32-linux-gnu/sys/ucontext.h
diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/user.h b/lib/libc/include/riscv32-linux-gnu/sys/user.h
similarity index 100%
rename from lib/libc/include/riscv32-linux-gnuilp32/sys/user.h
rename to lib/libc/include/riscv32-linux-gnu/sys/user.h
diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig
index d86d47ba59..4974e0f22b 100644
--- a/lib/std/zig/target.zig
+++ b/lib/std/zig/target.zig
@@ -56,7 +56,7 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi },
     .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf },
     .{ .arch = .powerpc, .os = .linux, .abi = .musl },
-    .{ .arch = .riscv32, .os = .linux, .abi = .gnuilp32, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } },
+    .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } },
     .{ .arch = .riscv32, .os = .linux, .abi = .musl },
     .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 } },
     .{ .arch = .riscv64, .os = .linux, .abi = .musl },
diff --git a/src/target.zig b/src/target.zig
index 768e4d957e..6cd5967d0e 100644
--- a/src/target.zig
+++ b/src/target.zig
@@ -369,7 +369,6 @@ pub fn addrSpaceCastIsValid(
 
 pub fn llvmMachineAbi(target: std.Target) ?[:0]const u8 {
     const have_float = switch (target.abi) {
-        .gnuilp32 => return "ilp32",
         .gnueabihf, .musleabihf, .eabihf => true,
         else => false,
     };
diff --git a/tools/process_headers.zig b/tools/process_headers.zig
index a15481afa2..7bed1a91c7 100644
--- a/tools/process_headers.zig
+++ b/tools/process_headers.zig
@@ -162,7 +162,7 @@ const glibc_targets = [_]LibCTarget{
     LibCTarget{
         .name = "riscv32-linux-gnu-rv32imac-ilp32",
         .arch = MultiArch{ .specific = Arch.riscv32 },
-        .abi = MultiAbi{ .specific = Abi.gnuilp32 },
+        .abi = MultiAbi{ .specific = Abi.gnu },
     },
     LibCTarget{
         .name = "riscv64-linux-gnu-rv64imac-lp64",