commit 245da61b120ff5449fdb2856473982adcdd7bea3
parent bc267b974204cd6ddf6f717a0a2597dc33f68406
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Tue, 29 Nov 2016 09:41:54 +0100
[cc1] Reduce the number of items in arch.h
Arch.h must dissapear because it is the responsible of having
different cc1, while it is not strictly needed. The worst part
is that we need different version of the same object files,
and it is generating a lot of problems in the compilation
process. This is only a first step to remove this problem.
Diffstat:
9 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/cc1/arch/amd64-sysv/arch.c b/cc1/arch/amd64-sysv/arch.c
@@ -5,6 +5,22 @@
#include "../../../inc/cc.h"
#include "../../cc1.h"
+#define RANK_BOOL 0
+#define RANK_SCHAR 1
+#define RANK_UCHAR 1
+#define RANK_CHAR 1
+#define RANK_SHORT 2
+#define RANK_USHORT 2
+#define RANK_INT 3
+#define RANK_UINT 3
+#define RANK_LONG 4
+#define RANK_ULONG 4
+#define RANK_LLONG 5
+#define RANK_ULLONG 5
+#define RANK_FLOAT 6
+#define RANK_DOUBLE 7
+#define RANK_LDOUBLE 8
+
/*
* Initializaion of type pointers were done with
* a C99 initilizator '... = &(Type) {...', but
diff --git a/cc1/arch/amd64-sysv/arch.h b/cc1/arch/amd64-sysv/arch.h
@@ -1,22 +1,5 @@
/* See LICENSE file for copyright and license details. */
-#define RANK_BOOL 0
-#define RANK_SCHAR 1
-#define RANK_UCHAR 1
-#define RANK_CHAR 1
-#define RANK_SHORT 2
-#define RANK_USHORT 2
-#define RANK_INT 3
-#define RANK_UINT 3
-#define RANK_LONG 4
-#define RANK_ULONG 4
-#define RANK_LLONG 5
-#define RANK_ULLONG 5
-#define RANK_FLOAT 6
-#define RANK_DOUBLE 7
-#define RANK_LDOUBLE 8
-#define TINT long long
-#define TUINT unsigned long long
-#define TFLOAT double
+#define RANK_INT 3
#define L_ENUM L_INT32
diff --git a/cc1/arch/i386-sysv/arch.c b/cc1/arch/i386-sysv/arch.c
@@ -5,6 +5,22 @@
#include "../../../inc/cc.h"
#include "../../cc1.h"
+#define RANK_BOOL 0
+#define RANK_SCHAR 1
+#define RANK_UCHAR 1
+#define RANK_CHAR 1
+#define RANK_SHORT 2
+#define RANK_USHORT 2
+#define RANK_INT 3
+#define RANK_UINT 3
+#define RANK_LONG 4
+#define RANK_ULONG 4
+#define RANK_LLONG 5
+#define RANK_ULLONG 5
+#define RANK_FLOAT 6
+#define RANK_DOUBLE 7
+#define RANK_LDOUBLE 8
+
/*
* Initializaion of type pointers were done with
* a C99 initilizator '... = &(Type) {...', but
diff --git a/cc1/arch/i386-sysv/arch.h b/cc1/arch/i386-sysv/arch.h
@@ -1,22 +1,5 @@
/* See LICENSE file for copyright and license details. */
-#define RANK_BOOL 0
-#define RANK_SCHAR 1
-#define RANK_UCHAR 1
-#define RANK_CHAR 1
-#define RANK_SHORT 2
-#define RANK_USHORT 2
-#define RANK_INT 3
-#define RANK_UINT 3
-#define RANK_LONG 4
-#define RANK_ULONG 4
-#define RANK_LLONG 5
-#define RANK_ULLONG 5
-#define RANK_FLOAT 6
-#define RANK_DOUBLE 7
-#define RANK_LDOUBLE 8
-#define TINT long long
-#define TUINT unsigned long long
-#define TFLOAT double
+#define RANK_INT 3
#define L_ENUM L_INT32
diff --git a/cc1/arch/qbe/arch.c b/cc1/arch/qbe/arch.c
@@ -5,6 +5,22 @@
#include "../../../inc/cc.h"
#include "../../cc1.h"
+#define RANK_BOOL 0
+#define RANK_SCHAR 1
+#define RANK_UCHAR 1
+#define RANK_CHAR 1
+#define RANK_SHORT 2
+#define RANK_USHORT 2
+#define RANK_INT 3
+#define RANK_UINT 3
+#define RANK_LONG 4
+#define RANK_ULONG 4
+#define RANK_LLONG 5
+#define RANK_ULLONG 5
+#define RANK_FLOAT 6
+#define RANK_DOUBLE 7
+#define RANK_LDOUBLE 8
+
/*
* Initializaion of type pointers were done with
* a C99 initilizator '... = &(Type) {...', but
diff --git a/cc1/arch/qbe/arch.h b/cc1/arch/qbe/arch.h
@@ -1,22 +1,4 @@
/* See LICENSE file for copyright and license details. */
-#define RANK_BOOL 0
-#define RANK_SCHAR 1
-#define RANK_UCHAR 1
-#define RANK_CHAR 1
-#define RANK_SHORT 2
-#define RANK_USHORT 2
-#define RANK_INT 3
-#define RANK_UINT 3
-#define RANK_LONG 4
-#define RANK_ULONG 4
-#define RANK_LLONG 5
-#define RANK_ULLONG 5
-#define RANK_FLOAT 6
-#define RANK_DOUBLE 7
-#define RANK_LDOUBLE 8
-
-#define TINT long long
-#define TUINT unsigned long long
-#define TFLOAT double
+#define RANK_INT 3
#define L_ENUM L_INT32
diff --git a/cc1/arch/z80/arch.c b/cc1/arch/z80/arch.c
@@ -5,6 +5,22 @@
#include "../../../inc/cc.h"
#include "../../cc1.h"
+#define RANK_BOOL 0
+#define RANK_SCHAR 1
+#define RANK_UCHAR 1
+#define RANK_CHAR 1
+#define RANK_SHORT 2
+#define RANK_USHORT 2
+#define RANK_INT 3
+#define RANK_UINT 3
+#define RANK_LONG 4
+#define RANK_ULONG 4
+#define RANK_LLONG 5
+#define RANK_ULLONG 5
+#define RANK_FLOAT 6
+#define RANK_DOUBLE 7
+#define RANK_LDOUBLE 8
+
/*
* Initializaion of type pointers were done with
* a C99 initilizator '... = &(Type) {...', but
diff --git a/cc1/arch/z80/arch.h b/cc1/arch/z80/arch.h
@@ -1,22 +1,5 @@
/* See LICENSE file for copyright and license details. */
-#define RANK_BOOL 0
-#define RANK_SCHAR 1
-#define RANK_UCHAR 1
-#define RANK_CHAR 1
-#define RANK_SHORT 2
-#define RANK_USHORT 2
-#define RANK_INT 3
-#define RANK_UINT 3
-#define RANK_LONG 4
-#define RANK_ULONG 4
-#define RANK_LLONG 5
-#define RANK_ULLONG 5
-#define RANK_FLOAT 6
-#define RANK_DOUBLE 7
-#define RANK_LDOUBLE 8
-#define TINT long long
-#define TUINT unsigned long long
-#define TFLOAT double
+#define RANK_INT 3
#define L_ENUM L_INT16
diff --git a/cc1/cc1.h b/cc1/cc1.h
@@ -6,6 +6,11 @@
#define NR_USWITCHES 20
+#define TINT long long
+#define TUINT unsigned long long
+#define TFLOAT double
+
+
/*
* Definition of enumerations
*/
