summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2017-10-15 09:12:33 -0400
committermidipix <writeonce@midipix.org>2017-10-15 09:43:16 -0400
commit4b0868b64dd91b3353719636d9ae35fe5700ead1 (patch)
treec55ada4b366cd5687ba7e67ee9219a4836a7bdbf
parentbd952743367f27123fa4acb4765613843a222a40 (diff)
downloadmmglue-4b0868b64dd91b3353719636d9ae35fe5700ead1.tar.bz2
mmglue-4b0868b64dd91b3353719636d9ae35fe5700ead1.tar.xz
psxglue.h: renamed __PSXOPT_TTYDBG --> __PSXOPT_DEBUG.
-rw-r--r--arch/nt32/psxglue.h2
-rw-r--r--arch/nt64/psxglue.h2
-rw-r--r--crt/crtdebug.c (renamed from crt/crtdev.c)0
-rw-r--r--crt/nt32/crt1.c4
-rw-r--r--crt/nt32/crtdebug.c3
-rw-r--r--crt/nt32/crtdev.c3
-rw-r--r--crt/nt64/crt1.c4
-rw-r--r--crt/nt64/crtdebug.c3
-rw-r--r--crt/nt64/crtdev.c3
9 files changed, 12 insertions, 12 deletions
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/crtdev.c b/crt/crtdebug.c
index e69de29..e69de29 100644
--- a/crt/crtdev.c
+++ b/crt/crtdebug.c
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;