From d32d30fc2e2717458dc441aea2c840c04d6b21e5 Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 25 Dec 2017 09:22:47 -0500 Subject: static linking: crt objects: fixed signature of __ctty. --- crt/nt32/Scrt1.c | 4 ++-- crt/nt32/Scrtldso.c | 6 +++--- crt/nt32/Scrtvrfs.c | 4 ++-- crt/nt64/Scrt1.c | 4 ++-- crt/nt64/Scrtldso.c | 6 +++--- crt/nt64/Scrtvrfs.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'crt') 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}; -- cgit v1.2.3