Module Name: src
Committed By: mrg
Date: Wed Apr 17 10:07:01 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h
src/external/gpl3/gcc/dist/libgcc: config.host
src/external/gpl3/gcc/dist/libgcc/config/riscv: t-netbsd
src/external/gpl3/gcc/lib/libgcc/arch/riscv64: defs.mk
Added Files:
src/external/gpl3/gcc/dist/libgcc/config/riscv: t-netbsd64
Log Message:
- define __riscv__ again
- define *intptr_t in terms of 'long int' always
- move fixtfdi.c, fixunstfdi.c, floatditf.c, and floatunditf.c into t-netbsd64
- remove duplicated riscv case in config.gcc, reducing upstream diff as well
- regen riscv64 mknative
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/dist/libgcc/config.host
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd64
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.10 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.11
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.10 Mon Apr 15 21:13:36 2019
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Wed Apr 17 10:07:00 2019
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */
#define TARGET_OS_CPP_BUILTINS() \
do { \
NETBSD_OS_CPP_BUILTINS_ELF(); \
+ builtin_define ("__riscv__"); \
/* The GNU C++ standard library requires this. */ \
if (c_dialect_cxx ()) \
builtin_define ("_GNU_SOURCE"); \
@@ -62,3 +63,9 @@ Boston, MA 02111-1307, USA. */
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
+
+#undef UINTPTR_TYPE
+#define UINTPTR_TYPE "long unsigned int"
+
+#undef INTPTR_TYPE
+#define INTPTR_TYPE "long int"
Index: src/external/gpl3/gcc/dist/libgcc/config.host
diff -u src/external/gpl3/gcc/dist/libgcc/config.host:1.24 src/external/gpl3/gcc/dist/libgcc/config.host:1.25
--- src/external/gpl3/gcc/dist/libgcc/config.host:1.24 Tue Apr 16 07:50:05 2019
+++ src/external/gpl3/gcc/dist/libgcc/config.host Wed Apr 17 10:07:00 2019
@@ -168,9 +168,6 @@ or1k-*-* | or1knd-*-*)
powerpc*-*-*)
cpu_type=rs6000
;;
-riscv*-*-*)
- cpu_type=riscv
- ;;
rs6000*-*-*)
;;
riscv*-*-*)
@@ -1158,6 +1155,11 @@ riscv*-*-linux*)
;;
riscv*-*-netbsd*)
tmake_file="${tmake_file} riscv/t-netbsd"
+ case ${host} in
+ riscv64*)
+ tmake_file="${tmake_file} riscv/t-netbsd64"
+ ;;
+ esac
;;
riscv*-*-*)
tmake_file="${tmake_file} riscv/t-softfp${host_address} t-softfp riscv/t-elf riscv/t-elf${host_address}"
Index: src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd
diff -u src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.1 src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd:1.1 Tue Apr 16 07:50:05 2019
+++ src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd Wed Apr 17 10:07:00 2019
@@ -11,10 +11,6 @@ LIB2ADD += $(srcdir)/soft-fp/addtf3.c \
$(srcdir)/soft-fp/fixunstfsi.c \
$(srcdir)/soft-fp/floatsitf.c \
$(srcdir)/soft-fp/floatunsitf.c \
- $(srcdir)/soft-fp/fixtfdi.c \
- $(srcdir)/soft-fp/fixunstfdi.c \
- $(srcdir)/soft-fp/floatditf.c \
- $(srcdir)/soft-fp/floatunditf.c \
$(srcdir)/soft-fp/extendsftf2.c \
$(srcdir)/soft-fp/extenddftf2.c \
$(srcdir)/soft-fp/trunctfsf2.c \
Index: src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.5 src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.6
--- src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk:1.5 Tue Apr 16 08:01:36 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/riscv64/defs.mk Wed Apr 17 10:07:00 2019
@@ -4,7 +4,7 @@
#
G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include
G_INTERNAL_CFLAGS=-g -O2 -O2 -DIN_GCC -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fPIC -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fPIC -I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include -DHAVE_CC_TLS
-G_LIB2ADD= ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatditf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunditf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c enable-execute-stack.c
+G_LIB2ADD= ${GNUHOSTDIST}/libgcc/soft-fp/addtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/divtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/eqtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/getf2.c ${GNUHOSTDIST}/libgcc/soft-fp/letf2.c ${GNUHOSTDIST}/libgcc/soft-fp/multf3.c ${GNUHOSTDIST}/libgcc/soft-fp/negtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/subtf3.c ${GNUHOSTDIST}/libgcc/soft-fp/unordtf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfsi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunsitf.c ${GNUHOSTDIST}/libgcc/soft-fp/extendsftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/extenddftf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfsf2.c ${GNUHOSTDIST}/libgcc/soft-fp/trunctfdf2.c ${GNUHOSTDIST}/libgcc/soft-fp/fixtfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/fixunstfdi.c ${GNUHOSTDIST}/libgcc/soft-fp/floatditf.c ${GNUHOSTDIST}/libgcc/soft-fp/floatunditf.c enable-execute-stack.c
G_LIB2ADDEH=${GNUHOSTDIST}/libgcc/unwind-dw2.c ${GNUHOSTDIST}/libgcc/unwind-dw2-fde-dip.c ${GNUHOSTDIST}/libgcc/unwind-sjlj.c ${GNUHOSTDIST}/libgcc/unwind-c.c ${GNUHOSTDIST}/libgcc/emutls.c
G_LIB2ADD_ST=
G_LIB1ASMFUNCS=
Added files:
Index: src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd64
diff -u /dev/null src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd64:1.1
--- /dev/null Wed Apr 17 10:07:01 2019
+++ src/external/gpl3/gcc/dist/libgcc/config/riscv/t-netbsd64 Wed Apr 17 10:07:00 2019
@@ -0,0 +1,4 @@
+LIB2ADD += $(srcdir)/soft-fp/fixtfdi.c \
+ $(srcdir)/soft-fp/fixunstfdi.c \
+ $(srcdir)/soft-fp/floatditf.c \
+ $(srcdir)/soft-fp/floatunditf.c
