Skip to content

Commit dde1a67

Browse files
author
Noam Preil
committed
plan9: 32-bit support
1 parent 7c31110 commit dde1a67

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

mkfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ HFILES=src/include/janet.h src/conf/janetconf.h
55
JANET_PATH=/sys/lib/janet
66
BIN=/$objtype/bin/
77
DISABLED=PROCESSES EV NET ASSEMBLER FFI UTC_MKTIME REALPATH DYNAMIC_MODULES THREADS SYMLINKS LOCALES UMASK
8-
JANET_CONFIG=JANET_SINGLE_THREADED JANET_OS_NAME=plan9 JANET_ARCH_NAME=$objtype JANET_API='' JANET_NO_RETURN='' JANET_SIMPLE_GETLINE JANET_64 `{echo JANET_NO_^$DISABLED} JANET_REDUCED_OS
8+
JANET_CONFIG=JANET_SINGLE_THREADED JANET_OS_NAME=plan9 JANET_ARCH_NAME=$objtype JANET_API='' JANET_NO_RETURN='' JANET_SIMPLE_GETLINE `{echo JANET_NO_^$DISABLED} JANET_REDUCED_OS PLAN9_`{echo -n $objtype}
9+
910
CFLAGS=-FTVBNcwp -D _POSIX_SOURCE -DJANET_PLAN9 -D_BSD_EXTENSION -D_LIMITS_EXTENSION -Isrc/include -Isrc/conf -I/sys/include/npe -Dtypestr=janettypestr -DJANET_API `{echo '-D'^$JANET_CONFIG}
1011
BOOT_CFLAGS=$CFLAGS -DJANET_BOOTSTRAP
1112

src/include/janet.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ extern "C" {
113113
#endif
114114

115115
/* Check 64-bit vs 32-bit */
116-
#ifndef JANET_64
117-
#ifndef JANET_32
118116
#if ((defined(__x86_64__) || defined(_M_X64)) \
119117
&& (defined(JANET_POSIX) || defined(JANET_WINDOWS))) \
120118
|| (defined(_WIN64)) /* Windows 64 bit */ \
@@ -123,15 +121,14 @@ extern "C" {
123121
|| (defined(__sparc__) && defined(__arch64__) || defined (__sparcv9)) /* BE */ \
124122
|| defined(__s390x__) /* S390 64-bit (BE) */ \
125123
|| (defined(__ppc64__) || defined(__PPC64__)) \
124+
|| defined(PLAN9_arm64) || defined(PLAN9_amd64) \
126125
|| defined(__aarch64__) /* ARM 64-bit */ \
127126
|| (defined(__riscv) && (__riscv_xlen == 64)) /* RISC-V 64-bit */ \
128127
|| defined(__loongarch64) /* LoongArch64 64-bit */
129128
#define JANET_64 1
130129
#else
131130
#define JANET_32 1
132131
#endif
133-
#endif
134-
#endif
135132

136133
/* Check big endian */
137134
#if defined(__LITTLE_ENDIAN__) || \

0 commit comments

Comments
 (0)