summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2017-12-25 09:22:47 -0500
committermidipix <writeonce@midipix.org>2017-12-25 09:25:56 -0500
commitd32d30fc2e2717458dc441aea2c840c04d6b21e5 (patch)
tree9d14a3e4f37bb41dfb0672df0cb73ed6f9268b85
parentd52444f5eaad0acd5fb0e3e0b04f9cf1f0394769 (diff)
downloadmmglue-d32d30fc2e2717458dc441aea2c840c04d6b21e5.tar.bz2
mmglue-d32d30fc2e2717458dc441aea2c840c04d6b21e5.tar.xz
static linking: crt objects: fixed signature of __ctty.
-rw-r--r--crt/nt32/Scrt1.c4
-rw-r--r--crt/nt32/Scrtldso.c6
-rw-r--r--crt/nt32/Scrtvrfs.c4
-rw-r--r--crt/nt64/Scrt1.c4
-rw-r--r--crt/nt64/Scrtldso.c6
-rw-r--r--crt/nt64/Scrtvrfs.c4
6 files changed, 14 insertions, 14 deletions
diff --git a/crt/nt32/Scrt1.c b/crt/nt32/Scrt1.c
index 0346479..d8ccb17 100644
--- a/crt/nt32/Scrt1.c
+++ b/crt/nt32/Scrt1.c
@@ -3,8 +3,8 @@
/* see also: crtidata.c */
/****************************************/
-static const unsigned char * __inherit = 0;
-extern const unsigned char * __ctty __attribute((weak,alias("__inherit")));
+static const unsigned short * __inherit = 0;
+extern const unsigned short * __ctty __attribute((weak,alias("__inherit")));
int __attribute__((__visibility__("hidden"))) __psx_init(int *,char ***,char ***,void *);
void __attribute__((__visibility__("hidden"))) __libc_entry_routine(void *,void *,const unsigned short *,int);
diff --git a/crt/nt32/Scrtldso.c b/crt/nt32/Scrtldso.c
index fbb4572..11e8915 100644
--- a/crt/nt32/Scrtldso.c
+++ b/crt/nt32/Scrtldso.c
@@ -5,6 +5,6 @@
const int __crtopt_ldso = __PSXOPT_LDSO;
/* pty server root-relative name */
-static const unsigned short __ctty[] = {'b','i','n','\\',
- 'n','t','c','t','t','y',
- '.','e','x','e',0};
+const unsigned short __ctty[] = {'b','i','n','\\',
+ 'n','t','c','t','t','y',
+ '.','e','x','e',0};
diff --git a/crt/nt32/Scrtvrfs.c b/crt/nt32/Scrtvrfs.c
index e60f317..82cf826 100644
--- a/crt/nt32/Scrtvrfs.c
+++ b/crt/nt32/Scrtvrfs.c
@@ -5,5 +5,5 @@
const int __crtopt_vrfs = __PSXOPT_VRFS;
/* pty server root-relative name */
-static const unsigned short __ctty[] = {'n','t','c','t','t','y',
- '.','e','x','e',0};
+const unsigned short __ctty[] = {'n','t','c','t','t','y',
+ '.','e','x','e',0};
diff --git a/crt/nt64/Scrt1.c b/crt/nt64/Scrt1.c
index 0346479..d8ccb17 100644
--- a/crt/nt64/Scrt1.c
+++ b/crt/nt64/Scrt1.c
@@ -3,8 +3,8 @@
/* see also: crtidata.c */
/****************************************/
-static const unsigned char * __inherit = 0;
-extern const unsigned char * __ctty __attribute((weak,alias("__inherit")));
+static const unsigned short * __inherit = 0;
+extern const unsigned short * __ctty __attribute((weak,alias("__inherit")));
int __attribute__((__visibility__("hidden"))) __psx_init(int *,char ***,char ***,void *);
void __attribute__((__visibility__("hidden"))) __libc_entry_routine(void *,void *,const unsigned short *,int);
diff --git a/crt/nt64/Scrtldso.c b/crt/nt64/Scrtldso.c
index fbb4572..11e8915 100644
--- a/crt/nt64/Scrtldso.c
+++ b/crt/nt64/Scrtldso.c
@@ -5,6 +5,6 @@
const int __crtopt_ldso = __PSXOPT_LDSO;
/* pty server root-relative name */
-static const unsigned short __ctty[] = {'b','i','n','\\',
- 'n','t','c','t','t','y',
- '.','e','x','e',0};
+const unsigned short __ctty[] = {'b','i','n','\\',
+ 'n','t','c','t','t','y',
+ '.','e','x','e',0};
diff --git a/crt/nt64/Scrtvrfs.c b/crt/nt64/Scrtvrfs.c
index e60f317..82cf826 100644
--- a/crt/nt64/Scrtvrfs.c
+++ b/crt/nt64/Scrtvrfs.c
@@ -5,5 +5,5 @@
const int __crtopt_vrfs = __PSXOPT_VRFS;
/* pty server root-relative name */
-static const unsigned short __ctty[] = {'n','t','c','t','t','y',
- '.','e','x','e',0};
+const unsigned short __ctty[] = {'n','t','c','t','t','y',
+ '.','e','x','e',0};