Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libjulia] bump for julia-1.10.0-beta3 #7484

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

benlorenz
Copy link
Contributor

to fix small_typeof errors, see #7283,

libcxxwrap_julia.so: undefined symbol: small_typeof, version JL_LIBJULIA_1.10

I needed to add a fix similar to JuliaLang/julia#48081 to fix missing strtoll and strtoull errors:

[08:58:19]  i686-w64-mingw32-g++ -march=pentium4 -m32 -shared   -Wl,--out-implib,/workspace/srcdir/julia/usr/lib/libjulia-internal.dll.a -pipe  -fno-rtti -std=c++14 -fno-gnu-unique -mincoming-stack-boundary=2   -O3 -ggdb2 -falign-functions -momit-leaf-frame-pointer -D_GNU_SOURCE -I. -I/workspace/srcdir/julia/src -I/workspace/srcdir/julia/src/flisp -I/workspace/srcdir/julia/src/support -I/workspace/destdir/include -I/workspace/srcdir/julia/usr/include -I/workspace/srcdir/julia/deps/valgrind -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common -Wno-comment -Wpointer-arith -Wundef -Wno-unused-result -DJL_BUILD_ARCH='"i686"' -DJL_BUILD_UNAME='"NT"' -I -DLLVM_SHLIB "-DJL_SYSTEM_IMAGE_PATH=\"../lib/julia/sys.dll\"" "-DJL_LIBJULIA_SONAME=\"libjulia.dll\"" ./jltypes.o ./gf.o ./typemap.o ./smallintset.o ./ast.o ./builtins.o ./module.o ./interpreter.o ./symbol.o ./dlload.o ./sys.o ./init.o ./task.o ./array.o ./staticdata.o ./toplevel.o ./jl_uv.o ./datatype.o ./simplevector.o ./runtime_intrinsics.o ./precompile.o ./jloptions.o ./threading.o ./partr.o ./stackwalk.o ./gc.o ./gc-debug.o ./gc-pages.o ./gc-stacks.o ./gc-alloc-profiler.o ./method.o ./jlapi.o ./signal-handling.o ./safepoint.o ./timing.o ./subtype.o ./rtutils.o ./gc-heap-snapshot.o ./crc32c.o ./APInt-C.o ./processor.o ./ircode.o ./opaque_closure.o ./codegen-stubs.o ./coverage.o ./runtime_ccall.o ./win32_ucontext.o  -o /workspace/srcdir/julia/usr/bin/libjulia-internal.dll -Wl,--stack,8388608 -Wl,--large-address-aware -L/workspace/destdir/bin  -L/workspace/srcdir/julia/usr/lib -L/workspace/srcdir/julia/usr/bin -Wl,--whole-archive ./flisp/libflisp.a -Wl,--whole-archive ./support/libsupport.a -ljulia -Wl,--whole-archive /workspace/destdir/lib/libuv.a -Wl,--whole-archive -lutf8proc -Wl,--no-whole-archive  -L/workspace/destdir/bin -lLLVM-15jl  -Wl,--export-all-symbols -Wl,--version-script=/workspace/srcdir/julia/src/julia.expmap -Wl,--no-whole-archive -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32 -latomic -lssp   
[08:58:19] ./flisp/libflisp.a(flisp.o): In function `strtoull_0b0o':
[08:58:19] /workspace/srcdir/julia/src/flisp/read.c:29: undefined reference to `strtoull'
[08:58:19] ./flisp/libflisp.a(flisp.o): In function `isnumtok_base':
[08:58:19] /workspace/srcdir/julia/src/flisp/read.c:92: undefined reference to `strtoll'
[08:58:19] collect2: error: ld returned 1 exit status
[08:58:19] make[1]: *** [Makefile:376: /workspace/srcdir/julia/usr/bin/libjulia-internal.dll] Error 1

Drop one upstreamed patch for nightly.

cc: @fingolfin

Copy link
Member

@fingolfin fingolfin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@benlorenz
Copy link
Contributor Author

This is not the first time we get some weird errors due to loader_trampolines.o (see e.g. #7283 (comment)):

$ grep loader_trampoline 018af97e-9d40-4232-bd89-aa618d729972.log
bk;t=1696403722269[07:15:22]  aarch64-apple-darwin20-clang -mmacosx-version-min=10.10 -O3 -g -DDEP_LIBS="\"$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libgcc_s.1.1.dylib):$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/julia/libopenlibm.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-internal.1.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-codegen.1.dylib):\"" -std=gnu99 -pipe -fPIC -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src/support -I/workspace/srcdir/julia-1.8.2/usr/include -ffreestanding /workspace/srcdir/julia-1.8.2/cli/trampolines/trampolines_aarch64.S -c -o loader_trampolines.o
bk;t=1696403722328[07:15:22]  aarch64-apple-darwin20-clang -mmacosx-version-min=10.10 -O3 -g -DDEP_LIBS="\"$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libgcc_s.1.1.dylib):$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/julia/libopenlibm.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-internal.1.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-codegen.1.dylib):\"" -std=gnu99 -pipe -fPIC -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src/support -I/workspace/srcdir/julia-1.8.2/usr/include -ffreestanding /workspace/srcdir/julia-1.8.2/cli/trampolines/trampolines_aarch64.S -c -o loader_trampolines.o
bk;t=1696403722687[07:15:22]  aarch64-apple-darwin20-clang -mmacosx-version-min=10.10  -std=gnu99 -pipe -fPIC -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src/support -I/workspace/srcdir/julia-1.8.2/usr/include -ffreestanding -DLIBRARY_EXPORTS -shared -O0 -g -DJL_DEBUG_BUILD -fstack-protector -DDEP_LIBS="\"$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libgcc_s.1.1.dylib):$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/julia/libopenlibm.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-internal-debug.1.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-codegen-debug.1.dylib):\"" ./loader_lib.dbg.obj ./loader_trampolines.o -o /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-debug.1.8.dylib -Wl,-compatibility_version,1 -Wl,-current_version,1.8.2  -ffreestanding -L/workspace/srcdir/julia-1.8.2/usr/lib -L/workspace/srcdir/julia-1.8.2/usr/lib -lSystem -Wl,-rpath,'@loader_path/' 
bk;t=1696403722733[07:15:22]  aarch64-apple-darwin20-clang -mmacosx-version-min=10.10  -std=gnu99 -pipe -fPIC -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src -I/workspace/srcdir/julia-1.8.2/src/support -I/workspace/srcdir/julia-1.8.2/usr/include -ffreestanding -DLIBRARY_EXPORTS -shared -O3 -g -DDEP_LIBS="\"$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libgcc_s.1.1.dylib):$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/julia/libopenlibm.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-internal.1.dylib):@$("/usr/bin/python" /workspace/srcdir/julia-1.8.2/contrib/relative_path.py /workspace/srcdir/julia-1.8.2/usr/lib /workspace/srcdir/julia-1.8.2/usr/lib/libjulia-codegen.1.dylib):\"" ./loader_lib.o ./loader_trampolines.o -o /workspace/srcdir/julia-1.8.2/usr/lib/libjulia.1.8.dylib -Wl,-compatibility_version,1 -Wl,-current_version,1.8.2  -ffreestanding -L/workspace/srcdir/julia-1.8.2/usr/lib -L/workspace/srcdir/julia-1.8.2/usr/lib -lSystem -Wl,-rpath,'@loader_path/' 
bk;t=1696403723573[07:15:23] ld: file too small (length=0) file './loader_trampolines.o' for architecture arm64

The first two commands to build loader_trampolines.o look identical. Maybe we are hitting some race-condition because we are building libjulia and libjulia-debug at the same time and this corrupts the file / we are reading it before the second process is done.
But I guess this disappears once I trigger a rebuild by marking this as ready.

@benlorenz benlorenz marked this pull request as ready for review October 4, 2023 07:41
@benlorenz benlorenz merged commit a076ee1 into JuliaPackaging:master Oct 4, 2023
@benlorenz benlorenz deleted the bl/julia110beta3 branch October 4, 2023 12:28
amontoison pushed a commit to amontoison/Yggdrasil that referenced this pull request Nov 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants