Skip to content

Commit b1695b7

Browse files
bmdhacksclaude
andcommitted
address PR review: remove --export-dynamic, fix vcxproj, rename jit_shared
- Remove --export-dynamic from Makefile LFLAGS (was accidentally reintroduced during merge; removed upstream in fec624c) - Restore BOM and no-trailing-newline in hl.vcxproj.filters for Visual Studio compatibility - Rename jit_shared.c to jit_common.c to match jit_common.h Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent bec06db commit b1695b7

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ if (WITH_VM)
229229
set(JIT_SOURCES
230230
src/jit_aarch64.c
231231
src/jit_aarch64_emit.c
232-
src/jit_shared.c
232+
src/jit_common.c
233233
)
234234
else()
235235
set(JIT_SOURCES
236236
src/jit_x86.c
237-
src/jit_shared.c
237+
src/jit_common.c
238238
)
239239
endif()
240240

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ STD = src/std/array.o src/std/buffer.o src/std/bytes.o src/std/cast.o src/std/da
4545
src/std/track.o
4646

4747
ifneq (,$(filter aarch64 arm64,$(ARCH)))
48-
HL_JIT = src/jit_aarch64.o src/jit_aarch64_emit.o src/jit_shared.o
48+
HL_JIT = src/jit_aarch64.o src/jit_aarch64_emit.o src/jit_common.o
4949
else
50-
HL_JIT = src/jit_x86.o src/jit_shared.o
50+
HL_JIT = src/jit_x86.o src/jit_common.o
5151
endif
5252

5353
HL = src/code.o $(HL_JIT) src/main.o src/module.o src/debugger.o src/profile.o
@@ -214,7 +214,7 @@ ifneq ($(ARCH),arm64)
214214
CFLAGS += -m$(MARCH)
215215
endif
216216
CFLAGS += -fPIC -pthread -fno-omit-frame-pointer $(shell pkg-config --cflags sdl2)
217-
LFLAGS += -lm -Wl,-rpath,.:'$$ORIGIN':$(INSTALL_LIB_DIR) -Wl,--export-dynamic -Wl,--no-undefined
217+
LFLAGS += -lm -Wl,-rpath,.:'$$ORIGIN':$(INSTALL_LIB_DIR) -Wl,--no-undefined
218218

219219
ifeq ($(MARCH),32)
220220
CFLAGS += -I /usr/include/i386-linux-gnu -msse2 -mfpmath=sse

hl.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
<ClCompile Include="src\code.c" />
362362
<ClCompile Include="src\debugger.c" />
363363
<ClCompile Include="src\jit_x86.c" />
364-
<ClCompile Include="src\jit_shared.c" />
364+
<ClCompile Include="src\jit_common.c" />
365365
<ClCompile Include="src\main.c" />
366366
<ClCompile Include="src\module.c" />
367367
<ClCompile Include="src\profile.c" />

hl.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="src\main.c" />
55
<ClCompile Include="src\code.c" />
66
<ClCompile Include="src\module.c" />
77
<ClCompile Include="src\jit_x86.c" />
8-
<ClCompile Include="src\jit_shared.c" />
8+
<ClCompile Include="src\jit_common.c" />
99
<ClCompile Include="src\debugger.c" />
1010
<ClCompile Include="src\profile.c" />
1111
</ItemGroup>
@@ -16,4 +16,4 @@
1616
<ClInclude Include="src\hlsystem.h" />
1717
<ClInclude Include="src\jit_common.h" />
1818
</ItemGroup>
19-
</Project>
19+
</Project>
File renamed without changes.

src/jit_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ extern preg *UNUSED;
155155
#define ASSERT(i) { printf("JIT ERROR %d (jit.c line %d)\n",i,(int)__LINE__); jit_exit(); }
156156
#endif
157157

158-
// Shared utility functions (implemented in jit_shared.c)
158+
// Shared utility functions (implemented in jit_common.c)
159159
void jit_buf(jit_ctx *ctx);
160160

161161
// AArch64: Emit a 32-bit instruction to the code buffer

0 commit comments

Comments
 (0)