Module Name: src
Committed By: matt
Date: Wed Aug 20 16:00:15 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config: netbsd-stdint.h
Log Message:
Fix netbsd-stdint.h to allow char and short for int_fast8_t and int_fast16_t
and their corresponding unsigned variants.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h
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.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.26 src/external/gpl3/gcc/dist/gcc/config.gcc:1.27
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.26 Thu Jul 31 22:58:40 2014
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Wed Aug 20 16:00:15 2014
@@ -1123,6 +1123,7 @@ hppa*-*-netbsd* | parisc*-*-netbsd*)
tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} \
pa/pa-netbsd.h pa/pa32-regs.h pa/pa32-netbsd.h"
tmake_file="${tmake_file} pa/t-netbsd"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
;;
hppa[12]*-*-hpux10*)
@@ -1279,6 +1280,7 @@ x86_64-*-freebsd*)
i[34567]86-*-netbsdelf*)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/netbsd-elf.h"
tmake_file="${tmake_file} i386/t-crtstuff"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
;;
i[34567]86-*-netbsd*)
@@ -1752,6 +1754,7 @@ m68k-*-elf* | fido-*-elf*)
m68010-*-netbsdelf* | m68k-*-netbsdelf* | m5407-*-netbsdelf*)
tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} m68k/netbsd-elf.h"
tm_defines="${tm_defines} MOTOROLA=1 USE_GAS=1"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
default_cf_cpu=5475
default_m68k_cpu=68020
@@ -2745,6 +2748,7 @@ vax-*-linux*)
;;
vax-*-netbsdelf*)
tm_file="${tm_file} elfos.h ${nbsd_tm_file} vax/elf.h vax/netbsd-elf.h"
+ tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt vax/elf.opt"
;;
vax-*-openbsd*)
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.1 src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.1 Sat Mar 1 09:26:00 2014
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h Wed Aug 20 16:00:15 2014
@@ -43,12 +43,28 @@ see the files COPYING3 and COPYING.RUNTI
#define UINT_LEAST32_TYPE "unsigned int"
#define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
+#ifdef CHAR_FAST8
+#define INT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? "int" : "signed char")
+#else
#define INT_FAST8_TYPE "int"
+#endif
+#ifdef SHORT_FAST16
+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "int" : "short int")
+#else
#define INT_FAST16_TYPE "int"
+#endif
#define INT_FAST32_TYPE "int"
#define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
+#ifdef CHAR_FAST8
+#define UINT_FAST8_TYPE (LONG_TYPE_SIZE == 64 ? "unsigned int" : "unsigned char")
+#else
#define UINT_FAST8_TYPE "unsigned int"
+#endif
+#ifdef SHORT_FAST16
+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "unsigned int" : "short unsigned int")
+#else
#define UINT_FAST16_TYPE "unsigned int"
+#endif
#define UINT_FAST32_TYPE "unsigned int"
#define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
