gansidecl.h (__attribute__, [...]): Delete.

* gansidecl.h (__attribute__, ATTRIBUTE_UNUSED_LABEL,
	ATTRIBUTE_UNUSED, ATTRIBUTE_NORETURN, ATTRIBUTE_PRINTF,
	ATTRIBUTE_PRINTF_1, ATTRIBUTE_PRINTF_2, ATTRIBUTE_PRINTF_3,
	ATTRIBUTE_PRINTF_4, ATTRIBUTE_PRINTF_5, GENERIC_PTR): Delete.

	* c-decl.c (field_decl_cmp): Use PTR instead of GENERIC_PTR.

	* cccp.c (pcfinclude): Likewise.

	* global.c (allocno_compare): Likewise.

	* haifa-sched.c (rank_for_schedule): Likewise.

	* local-alloc.c (qty_sugg_compare_1, qty_compare_1): Likewise.

	* reload1.c (hard_reg_use_compare, reload_reg_class_lower): Likewise.

	* stupid.c (stupid_reg_compare): Likewise.

	* tree.c (_obstack_allocated_p): Likewise.

	* varray.h (varray_data_tag, VARRAY_GENERIC_PTR_INIT): Likewise.

From-SVN: r29208
This commit is contained in:
Kaveh R. Ghazi 1999-09-08 15:44:18 +00:00 committed by Kaveh Ghazi
parent 98cc505096
commit e1b6684cec
11 changed files with 54 additions and 64 deletions

View File

@ -1,3 +1,28 @@
Wed Sep 8 11:40:47 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* gansidecl.h (__attribute__, ATTRIBUTE_UNUSED_LABEL,
ATTRIBUTE_UNUSED, ATTRIBUTE_NORETURN, ATTRIBUTE_PRINTF,
ATTRIBUTE_PRINTF_1, ATTRIBUTE_PRINTF_2, ATTRIBUTE_PRINTF_3,
ATTRIBUTE_PRINTF_4, ATTRIBUTE_PRINTF_5, GENERIC_PTR): Delete.
* c-decl.c (field_decl_cmp): Use PTR instead of GENERIC_PTR.
* cccp.c (pcfinclude): Likewise.
* global.c (allocno_compare): Likewise.
* haifa-sched.c (rank_for_schedule): Likewise.
* local-alloc.c (qty_sugg_compare_1, qty_compare_1): Likewise.
* reload1.c (hard_reg_use_compare, reload_reg_class_lower): Likewise.
* stupid.c (stupid_reg_compare): Likewise.
* tree.c (_obstack_allocated_p): Likewise.
* varray.h (varray_data_tag, VARRAY_GENERIC_PTR_INIT): Likewise.
1999-09-08 Bruce Korb autogen@linuxbox.com
* gcc/ch/Makefile.in: Give the hapless gperf user a hint about

View File

@ -358,7 +358,7 @@ static tree lookup_tag_reverse PROTO((tree));
static tree grokdeclarator PROTO((tree, tree, enum decl_context,
int));
static tree grokparms PROTO((tree, int));
static int field_decl_cmp PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int field_decl_cmp PROTO((const PTR, const PTR));
static void layout_array_type PROTO((tree));
/* C-specific option variables. */
@ -5453,8 +5453,8 @@ grokfield (filename, line, declarator, declspecs, width)
static int
field_decl_cmp (xp, yp)
const GENERIC_PTR xp;
const GENERIC_PTR yp;
const PTR xp;
const PTR yp;
{
tree *x = (tree *)xp, *y = (tree *)yp;

View File

@ -5517,7 +5517,7 @@ pcfinclude (buf, name, op)
cp += 4 - ((size_t) cp & 3);
/* Now get the string. */
str = (STRINGDEF *) (GENERIC_PTR) cp;
str = (STRINGDEF *) (PTR) cp;
string_start = cp += sizeof (STRINGDEF);
for (; *cp; cp++) /* skip the string */
@ -5552,7 +5552,7 @@ pcfinclude (buf, name, op)
else
/* Otherwise, for each key, */
for (; nkeys--; free (tmpbuf.buf), cp = endofthiskey + 1) {
KEYDEF *kp = (KEYDEF *) (GENERIC_PTR) cp;
KEYDEF *kp = (KEYDEF *) (PTR) cp;
HASHNODE *hp;
U_CHAR *bp;

View File

@ -47,41 +47,6 @@ Boston, MA 02111-1307, USA. */
# define inline __inline__ /* Modern gcc can use `__inline__' freely. */
#endif /* GCC >= 2.7 */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
# define __attribute__(x)
#endif
#ifndef ATTRIBUTE_UNUSED_LABEL
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
# define ATTRIBUTE_UNUSED_LABEL
# else
# define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
# endif /* GNUC < 2.93 */
#endif /* ATTRIBUTE_UNUSED_LABEL */
#ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
#endif /* ATTRIBUTE_UNUSED */
#ifndef ATTRIBUTE_NORETURN
#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
#endif /* ATTRIBUTE_NORETURN */
#ifndef ATTRIBUTE_PRINTF
#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((format (__printf__, m, n)))
#define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
#define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
#define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
#define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
#define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
#endif /* ATTRIBUTE_PRINTF */
#ifndef NULL
#define NULL 0
#endif
#define GENERIC_PTR PTR
#ifndef NULL_PTR
#define NULL_PTR ((PTR) 0)
#endif

View File

@ -256,7 +256,7 @@ static int n_regs_set;
static HARD_REG_SET eliminable_regset;
static int allocno_compare PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int allocno_compare PROTO((const PTR, const PTR));
static void global_conflicts PROTO((void));
static void expand_preferences PROTO((void));
static void prune_preferences PROTO((void));
@ -590,8 +590,8 @@ global_alloc (file)
static int
allocno_compare (v1p, v2p)
const GENERIC_PTR v1p;
const GENERIC_PTR v2p;
const PTR v1p;
const PTR v2p;
{
int v1 = *(int *)v1p, v2 = *(int *)v2p;
/* Note that the quotient will never be bigger than

View File

@ -444,7 +444,7 @@ static void sched_analyze_2 PROTO ((rtx, rtx));
static void sched_analyze_insn PROTO ((rtx, rtx, rtx));
static void sched_analyze PROTO ((rtx, rtx));
static void sched_note_set PROTO ((rtx, int));
static int rank_for_schedule PROTO ((const GENERIC_PTR, const GENERIC_PTR));
static int rank_for_schedule PROTO ((const PTR, const PTR));
static void swap_sort PROTO ((rtx *, int));
static void queue_insn PROTO ((rtx, int));
static int schedule_insn PROTO ((rtx, rtx *, int, int));
@ -4066,8 +4066,8 @@ while (0)
static int
rank_for_schedule (x, y)
const GENERIC_PTR x;
const GENERIC_PTR y;
const PTR x;
const PTR y;
{
rtx tmp = *(rtx *)y;
rtx tmp2 = *(rtx *)x;

View File

@ -251,9 +251,9 @@ static void update_equiv_regs PROTO((void));
static void no_equiv PROTO((rtx, rtx));
static void block_alloc PROTO((int));
static int qty_sugg_compare PROTO((int, int));
static int qty_sugg_compare_1 PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int qty_sugg_compare_1 PROTO((const PTR, const PTR));
static int qty_compare PROTO((int, int));
static int qty_compare_1 PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int qty_compare_1 PROTO((const PTR, const PTR));
static int combine_regs PROTO((rtx, rtx, int, int, rtx, int));
static int reg_meets_class_p PROTO((int, enum reg_class));
static void update_qty_class PROTO((int, int));
@ -1522,8 +1522,8 @@ qty_compare (q1, q2)
static int
qty_compare_1 (q1p, q2p)
const GENERIC_PTR q1p;
const GENERIC_PTR q2p;
const PTR q1p;
const PTR q2p;
{
register int q1 = *(int *)q1p, q2 = *(int *)q2p;
register int tem = QTY_CMP_PRI (q2) - QTY_CMP_PRI (q1);
@ -1562,8 +1562,8 @@ qty_sugg_compare (q1, q2)
static int
qty_sugg_compare_1 (q1p, q2p)
const GENERIC_PTR q1p;
const GENERIC_PTR q2p;
const PTR q1p;
const PTR q2p;
{
register int q1 = *(int *)q1p, q2 = *(int *)q2p;
register int tem = QTY_CMP_SUGG (q1) - QTY_CMP_SUGG (q2);

View File

@ -406,12 +406,12 @@ static void spill_hard_reg PROTO((int, FILE *, int));
static int finish_spills PROTO((int, FILE *));
static void ior_hard_reg_set PROTO((HARD_REG_SET *, HARD_REG_SET *));
static void scan_paradoxical_subregs PROTO((rtx));
static int hard_reg_use_compare PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int hard_reg_use_compare PROTO((const PTR, const PTR));
static void count_pseudo PROTO((struct hard_reg_n_uses *, int));
static void order_regs_for_reload PROTO((struct insn_chain *));
static void reload_as_needed PROTO((int));
static void forget_old_reloads_1 PROTO((rtx, rtx));
static int reload_reg_class_lower PROTO((const GENERIC_PTR, const GENERIC_PTR));
static int reload_reg_class_lower PROTO((const PTR, const PTR));
static void mark_reload_reg_in_use PROTO((int, int, enum reload_type,
enum machine_mode));
static void clear_reload_reg_in_use PROTO((int, int, enum reload_type,
@ -4047,8 +4047,8 @@ scan_paradoxical_subregs (x)
static int
hard_reg_use_compare (p1p, p2p)
const GENERIC_PTR p1p;
const GENERIC_PTR p2p;
const PTR p1p;
const PTR p2p;
{
struct hard_reg_n_uses *p1 = (struct hard_reg_n_uses *)p1p;
struct hard_reg_n_uses *p2 = (struct hard_reg_n_uses *)p2p;
@ -4549,8 +4549,8 @@ static int reload_nregs[MAX_RELOADS];
static int
reload_reg_class_lower (r1p, r2p)
const GENERIC_PTR r1p;
const GENERIC_PTR r2p;
const PTR r1p;
const PTR r2p;
{
register int r1 = *(short *)r1p, r2 = *(short *)r2p;
register int t;

View File

@ -124,7 +124,7 @@ static HARD_REG_SET *after_insn_hard_regs;
#define MARK_LIVE_AFTER(INSN,REGNO) \
SET_HARD_REG_BIT (after_insn_hard_regs[INSN_SUID (INSN)], (REGNO))
static int stupid_reg_compare PROTO((const GENERIC_PTR,const GENERIC_PTR));
static int stupid_reg_compare PROTO((const PTR,const PTR));
static int stupid_find_reg PROTO((int, enum reg_class, enum machine_mode,
int, int, int));
static void stupid_mark_refs PROTO((rtx, struct insn_chain *));
@ -443,8 +443,8 @@ stupid_life_analysis (f, nregs, file)
static int
stupid_reg_compare (r1p, r2p)
const GENERIC_PTR r1p;
const GENERIC_PTR r2p;
const PTR r1p;
const PTR r2p;
{
register int r1 = *(int *)r1p, r2 = *(int *)r2p;
register int len1 = reg_where_dead[r1] - REG_WHERE_BORN (r1);

View File

@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA. */
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
/* obstack.[ch] explicitly declined to prototype this. */
extern int _obstack_allocated_p PROTO ((struct obstack *h, GENERIC_PTR obj));
extern int _obstack_allocated_p PROTO ((struct obstack *h, PTR obj));
/* Tree nodes of permanent duration are allocated in this obstack.
They are the identifier nodes, and everything outside of

View File

@ -66,7 +66,7 @@ typedef union varray_data_tag {
unsigned long ul[1];
HOST_WIDE_INT hint[1];
unsigned HOST_WIDE_INT uhint[1];
GENERIC_PTR generic[1];
PTR generic[1];
char *cptr[1];
struct rtx_def *rtx[1];
struct rtvec_def *rtvec[1];
@ -121,7 +121,7 @@ extern varray_type varray_init PROTO ((size_t, size_t, const char *));
va = varray_init (num, sizeof (unsigned HOST_WIDE_INT), name)
#define VARRAY_GENERIC_PTR_INIT(va, num, name) \
va = varray_init (num, sizeof (GENERIC_PTR), name)
va = varray_init (num, sizeof (PTR), name)
#define VARRAY_CHAR_PTR_INIT(va, num, name) \
va = varray_init (num, sizeof (char *), name)