Skip to content

Commit 49d609c

Browse files
radaretrufae
authored andcommitted
Update to the latest tinycc in the CI ##build
1 parent d195f7c commit 49d609c

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

.github/workflows/tcc.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
git clone https://github.com/mirror/tinycc.git
1717
cd tinycc
1818
git checkout mob
19-
git reset --hard 917aad3bcfbb534875aa6d66609bdb36459460a4
19+
git reset --hard 560526a49dfffef118bcb7fba83c727639ec0a1d
2020
- name: Compiling and installing TinyCC
2121
working-directory: tinycc
2222
run: |
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
git clone https://github.com/mirror/tinycc.git
6060
cd tinycc && git checkout mob
61-
git reset --hard 917aad3bcfbb534875aa6d66609bdb36459460a4
61+
git reset --hard 560526a49dfffef118bcb7fba83c727639ec0a1d
6262
sudo apt-get --assume-yes install gperf wheel setuptools || true
6363
sudo python -m pip install --upgrade pip
6464
pip install r2pipe
@@ -99,7 +99,7 @@ jobs:
9999
git clone https://github.com/mirror/tinycc.git
100100
cd tinycc
101101
git checkout mob
102-
git reset --hard 917aad3bcfbb534875aa6d66609bdb36459460a4
102+
git reset --hard 560526a49dfffef118bcb7fba83c727639ec0a1d
103103
- name: Compiling and installing TinyCC
104104
working-directory: tinycc
105105
run: |
@@ -140,7 +140,7 @@ jobs:
140140
run: |
141141
git clone https://github.com/mirror/tinycc.git
142142
cd tinycc && git checkout mob
143-
git reset --hard 917aad3bcfbb534875aa6d66609bdb36459460a4
143+
git reset --hard 560526a49dfffef118bcb7fba83c727639ec0a1d
144144
sudo apt-get --assume-yes install gperf wheel setuptools || true
145145
sudo python -m pip install --upgrade pip
146146
pip install r2pipe

libr/debug/p/native/xnu/xnu_debug.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
#if APPLE_SDK_IPHONEOS
2828
kern_return_t mach_vm_protect
2929
(
30-
vm_map_t target_task,
31-
mach_vm_address_t address,
32-
mach_vm_size_t size,
33-
boolean_t set_maximum,
34-
vm_prot_t new_protection
35-
);
30+
vm_map_t target_task,
31+
mach_vm_address_t address,
32+
mach_vm_size_t size,
33+
boolean_t set_maximum,
34+
vm_prot_t new_protection
35+
);
3636
kern_return_t mach_vm_read
3737
(
38-
vm_map_t target_task,
39-
mach_vm_address_t address,
40-
mach_vm_size_t size,
41-
vm_offset_t *data,
42-
mach_msg_type_number_t *dataCnt
43-
);
38+
vm_map_t target_task,
39+
mach_vm_address_t address,
40+
mach_vm_size_t size,
41+
vm_offset_t *data,
42+
mach_msg_type_number_t *dataCnt
43+
);
4444
#else
4545
#include <mach/mach_vm.h>
4646
#endif

libr/lang/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include ../config.mk
22

33
NAME=r_lang
44
OBJS=lang.o
5-
R2DEPS=r_util r_cons r_asm
5+
R2DEPS=r_util r_cons r_asm r_syscall
66
CFLAGS+=-DR2_PLUGIN_INCORE
77
# CFLAGS+=-DCONFIG_VERSION=\"0.0.0\"
88
OBJS+=$(QJS_OBJS)

libr/libs.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ LIBS4=lang bin
99
LIBS5=debug egg
1010
LIBS6=core
1111
LIBS7=main
12-
LIBS8=
1312

14-
LIBS=$(LIBS0) $(LIBS1) $(LIBS2) $(LIBS3) $(LIBS4) $(LIBS5) $(LIBS6) $(LIBS7) $(LIBS8)
13+
LIBS=$(LIBS0) $(LIBS1) $(LIBS2) $(LIBS3) $(LIBS4) $(LIBS5) $(LIBS6) $(LIBS7)
1514
endif
1615

1716
.PHONY: $(LIBS)

mk/tcc.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PARTIALLD=${LD} -r --whole-archive
2222
LDFLAGS_LIB=-shared
2323
LDFLAGS_LIB+=-Dxx
2424
#Wl,-soname,lib${NAME}.${EXT_SO}.${VERSION}
25-
LDFLAGS_SONAME=-soname=
25+
LDFLAGS_SONAME=-soname
2626
#Wl,-soname=
2727
endif
2828

shlr/qjs/src/quickjs.c

+2
Original file line numberDiff line numberDiff line change
@@ -40095,8 +40095,10 @@ static const JSCFunctionListEntry js_number_funcs[] = {
4009540095
JS_PROP_DOUBLE_DEF("MAX_VALUE", 1.7976931348623157e+308, 0 ),
4009640096
JS_PROP_DOUBLE_DEF("MIN_VALUE", 5e-324, 0 ),
4009740097
JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
40098+
#if !__TINYCC__
4009840099
JS_PROP_DOUBLE_DEF("NEGATIVE_INFINITY", -INFINITY, 0 ),
4009940100
JS_PROP_DOUBLE_DEF("POSITIVE_INFINITY", INFINITY, 0 ),
40101+
#endif
4010040102
JS_PROP_DOUBLE_DEF("EPSILON", 2.220446049250313e-16, 0 ), /* ES6 */
4010140103
JS_PROP_DOUBLE_DEF("MAX_SAFE_INTEGER", 9007199254740991.0, 0 ), /* ES6 */
4010240104
JS_PROP_DOUBLE_DEF("MIN_SAFE_INTEGER", -9007199254740991.0, 0 ), /* ES6 */

0 commit comments

Comments
 (0)