From 4b0868b64dd91b3353719636d9ae35fe5700ead1 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 15 Oct 2017 09:12:33 -0400 Subject: psxglue.h: renamed __PSXOPT_TTYDBG --> __PSXOPT_DEBUG. --- arch/nt32/psxglue.h | 2 +- arch/nt64/psxglue.h | 2 +- crt/crtdebug.c | 0 crt/crtdev.c | 0 crt/nt32/crt1.c | 4 ++-- crt/nt32/crtdebug.c | 3 +++ crt/nt32/crtdev.c | 3 --- crt/nt64/crt1.c | 4 ++-- crt/nt64/crtdebug.c | 3 +++ crt/nt64/crtdev.c | 3 --- 10 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 crt/crtdebug.c delete mode 100644 crt/crtdev.c create mode 100644 crt/nt32/crtdebug.c delete mode 100644 crt/nt32/crtdev.c create mode 100644 crt/nt64/crtdebug.c delete mode 100644 crt/nt64/crtdev.c diff --git a/arch/nt32/psxglue.h b/arch/nt32/psxglue.h index d2bd7c2..2d80a86 100644 --- a/arch/nt32/psxglue.h +++ b/arch/nt32/psxglue.h @@ -3,7 +3,7 @@ #define __PSXOPT_NATIVE 0x0 #define __PSXOPT_POSIX 0x1 -#define __PSXOPT_TTYDBG 0x2 +#define __PSXOPT_DEBUG 0x2 #define __PSXOPT_LDSO 0x4 typedef int __ldso_dladdr(const void * addr, void * info); diff --git a/arch/nt64/psxglue.h b/arch/nt64/psxglue.h index d2bd7c2..2d80a86 100644 --- a/arch/nt64/psxglue.h +++ b/arch/nt64/psxglue.h @@ -3,7 +3,7 @@ #define __PSXOPT_NATIVE 0x0 #define __PSXOPT_POSIX 0x1 -#define __PSXOPT_TTYDBG 0x2 +#define __PSXOPT_DEBUG 0x2 #define __PSXOPT_LDSO 0x4 typedef int __ldso_dladdr(const void * addr, void * info); diff --git a/crt/crtdebug.c b/crt/crtdebug.c new file mode 100644 index 0000000..e69de29 diff --git a/crt/crtdev.c b/crt/crtdev.c deleted file mode 100644 index e69de29..0000000 diff --git a/crt/nt32/crt1.c b/crt/nt32/crt1.c index 90a6007..6605bcb 100644 --- a/crt/nt32/crt1.c +++ b/crt/nt32/crt1.c @@ -13,7 +13,7 @@ static const int __disabled = 0; extern const int __crtopt_posix __attribute((weak,alias("__disabled"))); -extern const int __crtopt_ttydbg __attribute((weak,alias("__disabled"))); +extern const int __crtopt_debug __attribute((weak,alias("__disabled"))); int main(); @@ -28,6 +28,6 @@ void start(void) __libc_entry_routine( main, __psx_init, - __crtopt_posix | __crtopt_ttydbg); + __crtopt_posix | __crtopt_debug); } diff --git a/crt/nt32/crtdebug.c b/crt/nt32/crtdebug.c new file mode 100644 index 0000000..4f4f6d2 --- /dev/null +++ b/crt/nt32/crtdebug.c @@ -0,0 +1,3 @@ +#include "psxglue.h" + +const int __crtopt_debug = __PSXOPT_DEBUG; diff --git a/crt/nt32/crtdev.c b/crt/nt32/crtdev.c deleted file mode 100644 index 8aa80e6..0000000 --- a/crt/nt32/crtdev.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "psxglue.h" - -const int __crtopt_ttydbg = __PSXOPT_TTYDBG; diff --git a/crt/nt64/crt1.c b/crt/nt64/crt1.c index 6d22669..8c1f838 100644 --- a/crt/nt64/crt1.c +++ b/crt/nt64/crt1.c @@ -13,7 +13,7 @@ static const int __disabled = 0; extern const int __crtopt_posix __attribute((weak,alias("__disabled"))); -extern const int __crtopt_ttydbg __attribute((weak,alias("__disabled"))); +extern const int __crtopt_debug __attribute((weak,alias("__disabled"))); int main(); @@ -28,6 +28,6 @@ void _start(void) __libc_entry_routine( main, __psx_init, - __crtopt_posix | __crtopt_ttydbg); + __crtopt_posix | __crtopt_debug); } diff --git a/crt/nt64/crtdebug.c b/crt/nt64/crtdebug.c new file mode 100644 index 0000000..4f4f6d2 --- /dev/null +++ b/crt/nt64/crtdebug.c @@ -0,0 +1,3 @@ +#include "psxglue.h" + +const int __crtopt_debug = __PSXOPT_DEBUG; diff --git a/crt/nt64/crtdev.c b/crt/nt64/crtdev.c deleted file mode 100644 index 8aa80e6..0000000 --- a/crt/nt64/crtdev.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "psxglue.h" - -const int __crtopt_ttydbg = __PSXOPT_TTYDBG; -- cgit v1.2.3