aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-29 03:46:03 +0000
committerRoland McGrath <roland@gnu.org>2003-03-29 03:46:03 +0000
commit8a3e01b9fb7b179be764d1c10cb0b33abd1e9f68 (patch)
treefc002e1e4b696dc4d8446406c7e12eb8b550e936 /elf
parentdd731d53dcdbb24cd2a3f299a2ba4362505d3f55 (diff)
downloadglibc-8a3e01b9fb7b179be764d1c10cb0b33abd1e9f68.tar
glibc-8a3e01b9fb7b179be764d1c10cb0b33abd1e9f68.tar.gz
glibc-8a3e01b9fb7b179be764d1c10cb0b33abd1e9f68.tar.bz2
glibc-8a3e01b9fb7b179be764d1c10cb0b33abd1e9f68.zip
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.
Diffstat (limited to 'elf')
-rw-r--r--elf/vismod.h14
-rw-r--r--elf/vismod1.c12
-rw-r--r--elf/vismod2.c14
-rw-r--r--elf/vismod3.c4
4 files changed, 22 insertions, 22 deletions
diff --git a/elf/vismod.h b/elf/vismod.h
index 505d381919..ef05ffd5e9 100644
--- a/elf/vismod.h
+++ b/elf/vismod.h
@@ -5,21 +5,21 @@ extern int callinmod1 (void);
extern int (*getinmod1 (void)) (void);
extern int callitcpt1 (void);
extern int (*getitcpt1 (void)) (void);
-extern const char *getvarlocal1 (void);
-extern const char *getvarinmod1 (void);
-extern const char *getvaritcpt1 (void);
+extern const char **getvarlocal1 (void);
+extern const char **getvarinmod1 (void);
+extern const char **getvaritcpt1 (void);
extern int calllocal2 (void);
extern int (*getlocal2 (void)) (void);
extern int callinmod2 (void);
extern int (*getinmod2 (void)) (void);
extern int callitcpt2 (void);
extern int (*getitcpt2 (void)) (void);
-extern const char *getvarlocal2 (void);
-extern const char *getvarinmod2 (void);
-extern const char *getvaritcpt2 (void);
+extern const char **getvarlocal2 (void);
+extern const char **getvarinmod2 (void);
+extern const char **getvaritcpt2 (void);
extern int callitcpt3 (void);
extern int (*getitcpt3 (void)) (void);
-extern const char *getvaritcpt3 (void);
+extern const char **getvaritcpt3 (void);
extern int protinmod (void);
extern int protitcpt (void);
diff --git a/elf/vismod1.c b/elf/vismod1.c
index 807dfe15c4..6f9c1a59f9 100644
--- a/elf/vismod1.c
+++ b/elf/vismod1.c
@@ -79,26 +79,26 @@ int
const char *protvarlocal = __FILE__;
asm (".protected protvarlocal");
-const char *
+const char **
getvarlocal1 (void)
{
- return protvarlocal;
+ return &protvarlocal;
}
const char *protvarinmod = __FILE__;
asm (".protected protvarinmod");
-const char *
+const char **
getvarinmod1 (void)
{
- return protvarinmod;
+ return &protvarinmod;
}
const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt");
-const char *
+const char **
getvaritcpt1 (void)
{
- return protvaritcpt;
+ return &protvaritcpt;
}
diff --git a/elf/vismod2.c b/elf/vismod2.c
index f2d5c22da6..5443e7c8a7 100644
--- a/elf/vismod2.c
+++ b/elf/vismod2.c
@@ -80,28 +80,28 @@ int
const char *protvarlocal = __FILE__;
asm (".protected protvarlocal");
-const char *
+const char **
getvarlocal2 (void)
{
- return protvarlocal;
+ return &protvarlocal;
}
const char *protvarinmod = __FILE__;
asm (".protected protvarinmod");
-const char *
+const char **
getvarinmod2 (void)
{
- return protvarinmod;
+ return &protvarinmod;
}
const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt");
-const char *
+const char **
getvaritcpt2 (void)
{
- return protvaritcpt;
+ return &protvaritcpt;
}
/* We must never call these functions. */
@@ -117,7 +117,7 @@ int
abort ();
}
-const char *
+const char **
getvaritcpt3 (void)
{
abort ();
diff --git a/elf/vismod3.c b/elf/vismod3.c
index cde3291f63..c9df95cb00 100644
--- a/elf/vismod3.c
+++ b/elf/vismod3.c
@@ -40,8 +40,8 @@ int
const char *protvaritcpt = __FILE__;
asm (".protected protvaritcpt");
-const char *
+const char **
getvaritcpt3 (void)
{
- return protvaritcpt;
+ return &protvaritcpt;
}