aboutsummaryrefslogtreecommitdiff
path: root/glibc
diff options
context:
space:
mode:
authorDarius Rad <darius@bluespec.com>2015-02-08 16:43:59 -0500
committerDarius Rad <darius@bluespec.com>2015-02-09 08:58:43 -0500
commitf70c0dcba4d9878723d4c65b6fef6cc0d1641924 (patch)
treea218745690b29a5fc1cd8f1cc7a4d12652ed2b77 /glibc
parent5909150db24bb7144325b9e3730c36c07ef9b2a4 (diff)
downloadriscv-gnu-toolchain-f70c0dcba4d9878723d4c65b6fef6cc0d1641924.zip
riscv-gnu-toolchain-f70c0dcba4d9878723d4c65b6fef6cc0d1641924.tar.gz
riscv-gnu-toolchain-f70c0dcba4d9878723d4c65b6fef6cc0d1641924.tar.bz2
glibc: Combine wordsize.h for 32 and 64 bit.
This allows for sharing headers between RV32 and RV64 compilers, which in turn supports a combined toolchain for both targets, with appropriate duplicate builds of glibc.
Diffstat (limited to 'glibc')
-rw-r--r--glibc/sysdeps/riscv/bits/wordsize.h (renamed from glibc/sysdeps/riscv/rv64/bits/wordsize.h)4
-rw-r--r--glibc/sysdeps/riscv/rv32/bits/wordsize.h19
2 files changed, 4 insertions, 19 deletions
diff --git a/glibc/sysdeps/riscv/rv64/bits/wordsize.h b/glibc/sysdeps/riscv/bits/wordsize.h
index 1f64313..67bb48f 100644
--- a/glibc/sysdeps/riscv/rv64/bits/wordsize.h
+++ b/glibc/sysdeps/riscv/bits/wordsize.h
@@ -16,5 +16,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#if defined __riscv64
#define __WORDSIZE 64
#define __WORDSIZE_TIME64_COMPAT32 1
+#else
+#define __WORDSIZE 32
+#endif
diff --git a/glibc/sysdeps/riscv/rv32/bits/wordsize.h b/glibc/sysdeps/riscv/rv32/bits/wordsize.h
deleted file mode 100644
index 184080c..0000000
--- a/glibc/sysdeps/riscv/rv32/bits/wordsize.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#define __WORDSIZE 32