2003-03-26 H.J. Lu <hjl@gnu.org>

* elf/vismod.h (getvarlocal1): Return const char **.
	(getvarinmod1): Likewise.
	(getvaritcpt1): Likewise.
	(getvarlocal2): Likewise.
	(getvarinmod2): Likewise.
	(getvaritcpt2): Likewise.
	(getvaritcpt3): Likewise.
	* elf/vismain.c (do_test): Adjusted.
	* elf/vismod1.c (getvarlocal1): Return address.
	(getvarinmod1): Likewise.
	(getvaritcpt1): Likewise.
	* elf/vismod2.c (getvarlocal2): Likewise.
	(getvarinmod2): Likewise.
	(getvaritcpt2): Likewise.
	* elf/vismod3.c (getvaritcpt3): Likewise.
This commit is contained in:
Roland McGrath 2003-03-29 03:46:03 +00:00
parent dd731d53dc
commit 8a3e01b9fb
4 changed files with 22 additions and 22 deletions

View File

@ -5,21 +5,21 @@ extern int callinmod1 (void);
extern int (*getinmod1 (void)) (void); extern int (*getinmod1 (void)) (void);
extern int callitcpt1 (void); extern int callitcpt1 (void);
extern int (*getitcpt1 (void)) (void); extern int (*getitcpt1 (void)) (void);
extern const char *getvarlocal1 (void); extern const char **getvarlocal1 (void);
extern const char *getvarinmod1 (void); extern const char **getvarinmod1 (void);
extern const char *getvaritcpt1 (void); extern const char **getvaritcpt1 (void);
extern int calllocal2 (void); extern int calllocal2 (void);
extern int (*getlocal2 (void)) (void); extern int (*getlocal2 (void)) (void);
extern int callinmod2 (void); extern int callinmod2 (void);
extern int (*getinmod2 (void)) (void); extern int (*getinmod2 (void)) (void);
extern int callitcpt2 (void); extern int callitcpt2 (void);
extern int (*getitcpt2 (void)) (void); extern int (*getitcpt2 (void)) (void);
extern const char *getvarlocal2 (void); extern const char **getvarlocal2 (void);
extern const char *getvarinmod2 (void); extern const char **getvarinmod2 (void);
extern const char *getvaritcpt2 (void); extern const char **getvaritcpt2 (void);
extern int callitcpt3 (void); extern int callitcpt3 (void);
extern int (*getitcpt3 (void)) (void); extern int (*getitcpt3 (void)) (void);
extern const char *getvaritcpt3 (void); extern const char **getvaritcpt3 (void);
extern int protinmod (void); extern int protinmod (void);
extern int protitcpt (void); extern int protitcpt (void);

View File

@ -79,26 +79,26 @@ int
const char *protvarlocal = __FILE__; const char *protvarlocal = __FILE__;
asm (".protected protvarlocal"); asm (".protected protvarlocal");
const char * const char **
getvarlocal1 (void) getvarlocal1 (void)
{ {
return protvarlocal; return &protvarlocal;
} }
const char *protvarinmod = __FILE__; const char *protvarinmod = __FILE__;
asm (".protected protvarinmod"); asm (".protected protvarinmod");
const char * const char **
getvarinmod1 (void) getvarinmod1 (void)
{ {
return protvarinmod; return &protvarinmod;
} }
const char *protvaritcpt = __FILE__; const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt"); asm (".protected protvaritcpt");
const char * const char **
getvaritcpt1 (void) getvaritcpt1 (void)
{ {
return protvaritcpt; return &protvaritcpt;
} }

View File

@ -80,28 +80,28 @@ int
const char *protvarlocal = __FILE__; const char *protvarlocal = __FILE__;
asm (".protected protvarlocal"); asm (".protected protvarlocal");
const char * const char **
getvarlocal2 (void) getvarlocal2 (void)
{ {
return protvarlocal; return &protvarlocal;
} }
const char *protvarinmod = __FILE__; const char *protvarinmod = __FILE__;
asm (".protected protvarinmod"); asm (".protected protvarinmod");
const char * const char **
getvarinmod2 (void) getvarinmod2 (void)
{ {
return protvarinmod; return &protvarinmod;
} }
const char *protvaritcpt = __FILE__; const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt"); asm (".protected protvaritcpt");
const char * const char **
getvaritcpt2 (void) getvaritcpt2 (void)
{ {
return protvaritcpt; return &protvaritcpt;
} }
/* We must never call these functions. */ /* We must never call these functions. */
@ -117,7 +117,7 @@ int
abort (); abort ();
} }
const char * const char **
getvaritcpt3 (void) getvaritcpt3 (void)
{ {
abort (); abort ();

View File

@ -40,8 +40,8 @@ int
const char *protvaritcpt = __FILE__; const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt"); asm (".protected protvaritcpt");
const char * const char **
getvaritcpt3 (void) getvaritcpt3 (void)
{ {
return protvaritcpt; return &protvaritcpt;
} }