[hackers] [scc] [cc1] Remove non needed defines from arch.h || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Tue, 26 Jan 2016 10:57:43 +0100 (CET)

commit 9a456e19d03b2c6e68182cac6e8fbd77eecfc90e
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Mon Jan 25 17:53:16 2016 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Mon Jan 25 17:55:41 2016 +0100

    [cc1] Remove non needed defines from arch.h
    
    These defines were needed in other time, before of having a full multi-support
    implemented. In this case they were not needed and it was hidden a bit the sizes
    of the primitive types.

diff --git a/cc1/arch/amd64-sysv/arch.c b/cc1/arch/amd64-sysv/arch.c
index 9fbd32d..ea043b4 100644
--- a/cc1/arch/amd64-sysv/arch.c
+++ b/cc1/arch/amd64-sysv/arch.c
_AT_@ -40,7 +40,7 @@ static Type types[] = {
         },
         { /* 3 = schartype */
                 .op = INT,
- .letter = L_SCHAR,
+ .letter = L_INT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -52,7 +52,7 @@ static Type types[] = {
         },
         { /* 4 = uchartype */
                 .op = INT,
- .letter = L_UCHAR,
+ .letter = L_UINT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -63,7 +63,7 @@ static Type types[] = {
         },
         { /* 5 = chartype */
                 .op = INT,
- .letter = L_CHAR,
+ .letter = L_INT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -75,7 +75,7 @@ static Type types[] = {
         },
         { /* 6 = ushortype */
                 .op = INT,
- .letter = L_USHORT,
+ .letter = L_UINT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -86,7 +86,7 @@ static Type types[] = {
         },
         { /* 7 = shortype */
                 .op = INT,
- .letter = L_SHORT,
+ .letter = L_INT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -98,7 +98,7 @@ static Type types[] = {
         },
         { /* 8 = uinttype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -109,7 +109,7 @@ static Type types[] = {
         },
         { /* 9 = inttype */
                 .op = INT,
- .letter = L_INT,
+ .letter = L_INT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -121,7 +121,7 @@ static Type types[] = {
         },
         { /* 10 = longtype */
                 .op = INT,
- .letter = L_LONG,
+ .letter = L_INT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -133,7 +133,7 @@ static Type types[] = {
         },
         { /* 11 = ulongtype */
                 .op = INT,
- .letter = L_ULONG,
+ .letter = L_UINT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -144,7 +144,7 @@ static Type types[] = {
         },
         { /* 12 = ullongtype */
                 .op = INT,
- .letter = L_ULLONG,
+ .letter = L_UINT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -155,7 +155,7 @@ static Type types[] = {
         },
         { /* 13 = llongtype */
                 .op = INT,
- .letter = L_LLONG,
+ .letter = L_INT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -197,7 +197,7 @@ static Type types[] = {
         },
         { /* 17 = sizettype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -214,7 +214,7 @@ static Type types[] = {
         },
         { /* 19 = pdifftype */
                 .op = INT,
- .letter = L_LONG,
+ .letter = L_INT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
diff --git a/cc1/arch/amd64-sysv/arch.h b/cc1/arch/amd64-sysv/arch.h
index 7ff94d2..6d085d6 100644
--- a/cc1/arch/amd64-sysv/arch.h
+++ b/cc1/arch/amd64-sysv/arch.h
_AT_@ -20,15 +20,4 @@
 #define TFLOAT double
 #define TSIZE unsigned long
 
-#define L_SCHAR L_INT8
-#define L_UCHAR L_UINT8
-#define L_CHAR L_INT8
-#define L_SHORT L_INT16
-#define L_USHORT L_UINT16
-#define L_INT L_INT32
-#define L_UINT L_UINT32
-#define L_LONG L_INT64
-#define L_ULONG L_UINT64
-#define L_LLONG L_INT64
-#define L_ULLONG L_UINT64
-#define L_ENUM L_INT
+#define L_ENUM L_INT32
diff --git a/cc1/arch/i386-sysv/arch.c b/cc1/arch/i386-sysv/arch.c
index 792686b..f2d3240 100644
--- a/cc1/arch/i386-sysv/arch.c
+++ b/cc1/arch/i386-sysv/arch.c
_AT_@ -40,7 +40,7 @@ static Type types[] = {
         },
         { /* 3 = schartype */
                 .op = INT,
- .letter = L_SCHAR,
+ .letter = L_INT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -52,7 +52,7 @@ static Type types[] = {
         },
         { /* 4 = uchartype */
                 .op = INT,
- .letter = L_UCHAR,
+ .letter = L_UINT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -63,7 +63,7 @@ static Type types[] = {
         },
         { /* 5 = chartype */
                 .op = INT,
- .letter = L_CHAR,
+ .letter = L_INT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -75,7 +75,7 @@ static Type types[] = {
         },
         { /* 6 = ushortype */
                 .op = INT,
- .letter = L_USHORT,
+ .letter = L_UINT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -86,7 +86,7 @@ static Type types[] = {
         },
         { /* 7 = shortype */
                 .op = INT,
- .letter = L_SHORT,
+ .letter = L_INT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -98,7 +98,7 @@ static Type types[] = {
         },
         { /* 8 = uinttype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -109,7 +109,7 @@ static Type types[] = {
         },
         { /* 9 = inttype */
                 .op = INT,
- .letter = L_INT,
+ .letter = L_INT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -121,7 +121,7 @@ static Type types[] = {
         },
         { /* 10 = longtype */
                 .op = INT,
- .letter = L_LONG,
+ .letter = L_INT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -133,7 +133,7 @@ static Type types[] = {
         },
         { /* 11 = ulongtype */
                 .op = INT,
- .letter = L_ULONG,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -144,7 +144,7 @@ static Type types[] = {
         },
         { /* 12 = ullongtype */
                 .op = INT,
- .letter = L_ULLONG,
+ .letter = L_UINT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -155,7 +155,7 @@ static Type types[] = {
         },
         { /* 13 = llongtype */
                 .op = INT,
- .letter = L_LLONG,
+ .letter = L_INT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -197,7 +197,7 @@ static Type types[] = {
         },
         { /* 17 = sizettype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -214,7 +214,7 @@ static Type types[] = {
         },
         { /* 19 = pdifftype */
                 .op = INT,
- .letter = L_INT,
+ .letter = L_INT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
diff --git a/cc1/arch/i386-sysv/arch.h b/cc1/arch/i386-sysv/arch.h
index c3a49a7..6d085d6 100644
--- a/cc1/arch/i386-sysv/arch.h
+++ b/cc1/arch/i386-sysv/arch.h
_AT_@ -20,15 +20,4 @@
 #define TFLOAT double
 #define TSIZE unsigned long
 
-#define L_SCHAR L_INT8
-#define L_UCHAR L_UINT8
-#define L_CHAR L_INT8
-#define L_SHORT L_INT16
-#define L_USHORT L_UINT16
-#define L_INT L_INT32
-#define L_UINT L_UINT32
-#define L_LONG L_INT32
-#define L_ULONG L_UINT32
-#define L_LLONG L_INT64
-#define L_ULLONG L_UINT64
-#define L_ENUM L_INT
+#define L_ENUM L_INT32
diff --git a/cc1/arch/z80/arch.c b/cc1/arch/z80/arch.c
index 996dce7..851bb77 100644
--- a/cc1/arch/z80/arch.c
+++ b/cc1/arch/z80/arch.c
_AT_@ -40,7 +40,7 @@ static Type types[] = {
         },
         { /* 3 = schartype */
                 .op = INT,
- .letter = L_SCHAR,
+ .letter = L_INT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -52,7 +52,7 @@ static Type types[] = {
         },
         { /* 4 = uchartype */
                 .op = INT,
- .letter = L_UCHAR,
+ .letter = L_UINT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -63,7 +63,7 @@ static Type types[] = {
         },
         { /* 5 = chartype */
                 .op = INT,
- .letter = L_CHAR,
+ .letter = L_UINT8,
                 .defined = 1,
                 .size = 1,
                 .integer = 1,
_AT_@ -75,7 +75,7 @@ static Type types[] = {
         },
         { /* 6 = ushortype */
                 .op = INT,
- .letter = L_USHORT,
+ .letter = L_UINT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -86,7 +86,7 @@ static Type types[] = {
         },
         { /* 7 = shortype */
                 .op = INT,
- .letter = L_SHORT,
+ .letter = L_INT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -98,7 +98,7 @@ static Type types[] = {
         },
         { /* 8 = uinttype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -109,7 +109,7 @@ static Type types[] = {
         },
         { /* 9 = inttype */
                 .op = INT,
- .letter = L_INT,
+ .letter = L_INT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -121,7 +121,7 @@ static Type types[] = {
         },
         { /* 10 = longtype */
                 .op = INT,
- .letter = L_LONG,
+ .letter = L_INT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -133,7 +133,7 @@ static Type types[] = {
         },
         { /* 11 = ulongtype */
                 .op = INT,
- .letter = L_ULONG,
+ .letter = L_UINT32,
                 .defined = 1,
                 .size = 4,
                 .integer = 1,
_AT_@ -144,7 +144,7 @@ static Type types[] = {
         },
         { /* 12 = ullongtype */
                 .op = INT,
- .letter = L_ULLONG,
+ .letter = L_UINT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -155,7 +155,7 @@ static Type types[] = {
         },
         { /* 13 = llongtype */
                 .op = INT,
- .letter = L_LLONG,
+ .letter = L_INT64,
                 .defined = 1,
                 .size = 8,
                 .integer = 1,
_AT_@ -197,7 +197,7 @@ static Type types[] = {
         },
         { /* 17 = sizettype */
                 .op = INT,
- .letter = L_UINT,
+ .letter = L_UINT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
_AT_@ -214,7 +214,7 @@ static Type types[] = {
         },
         { /* 7 = pdifftype */
                 .op = INT,
- .letter = L_SHORT,
+ .letter = L_INT16,
                 .defined = 1,
                 .size = 2,
                 .integer = 1,
diff --git a/cc1/arch/z80/arch.h b/cc1/arch/z80/arch.h
index 74d7239..f9977b3 100644
--- a/cc1/arch/z80/arch.h
+++ b/cc1/arch/z80/arch.h
_AT_@ -20,15 +20,4 @@
 #define TFLOAT double
 #define TSIZE unsigned short
 
-#define L_SCHAR L_INT8
-#define L_UCHAR L_UINT8
-#define L_CHAR L_UINT8
-#define L_SHORT L_INT16
-#define L_USHORT L_UINT16
-#define L_INT L_INT16
-#define L_UINT L_UINT16
-#define L_LONG L_INT32
-#define L_ULONG L_UINT32
-#define L_LLONG L_INT64
-#define L_ULLONG L_UINT64
-#define L_ENUM L_INT
+#define L_ENUM L_INT16
Received on Tue Jan 26 2016 - 10:57:43 CET

This archive was generated by hypermail 2.3.0 : Tue Jan 26 2016 - 11:00:33 CET