Skip to content

Commit fcd463c

Browse files
authored
Unrolled build for rust-lang#120533
Rollup merge of rust-lang#120533 - androm3da:bcain/update_hex_docs, r=wesleywiser Correct paths for hexagon-unknown-none-elf platform doc Update the library paths to correctly refer to libdemo{1,2}_hexagon and switch to the release build instead. Update references to libstandalone to the specific G0/PIC archive instead.
2 parents 4e3eed4 + 647a453 commit fcd463c

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/doc/rustc/src/platform-support/hexagon-unknown-none-elf.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ q6_arch=v65
128128
g0_lib_path=${sdk_libs}/${q6_arch}/G0
129129
pic_lib_path=${sdk_libs}/${q6_arch}/G0/pic
130130

131-
cargo build --target=hexagon-unknown-none-elf -Zbuild-std
131+
build_cfg=release
132+
cargo build --target=hexagon-unknown-none-elf -Zbuild-std --release
132133

133134
# Builds an executable against "hexagon standalone OS" suitable for emulation:
134135
${cc} --target=hexagon-unknown-none-elf -o testit \
@@ -142,12 +143,12 @@ ${cc} --target=hexagon-unknown-none-elf -o testit \
142143
-L${sdk_libs}/${q6_arch}/ \
143144
-L${sdk_libs}/ \
144145
testit.c \
145-
target/hexagon-unknown-none-elf/debug/libmin_ex_lib_lin.rlib \
146-
target/hexagon-unknown-none-elf/debug/deps/libcore-*.rlib \
147-
target/hexagon-unknown-none-elf/debug/deps/libcompiler_builtins-*.rlib \
146+
target/hexagon-unknown-none-elf/${build_cfg}/libdemo1_hexagon.rlib \
147+
target/hexagon-unknown-none-elf/${build_cfg}/deps/libcore-*.rlib \
148+
target/hexagon-unknown-none-elf/${build_cfg}/deps/libcompiler_builtins-*.rlib \
148149
-Wl,--start-group \
149150
-Wl,--defsym,_SDA_BASE_=0,--defsym,__sbss_start=0,--defsym,__sbss_end=0 \
150-
-lstandalone \
151+
${g0_lib_path}/libstandalone.a \
151152
${g0_lib_path}/libc.a \
152153
-lgcc \
153154
-lc_eh \
@@ -248,9 +249,9 @@ ${cc} --target=hexagon-unknown-none-elf -o testit.so \
248249
-Wl,--wrap=memalign \
249250
-m${q6_arch} \
250251
testit.c \
251-
target/hexagon-unknown-none-elf/debug/libmin_ex_lib_lin.rlib \
252-
target/hexagon-unknown-none-elf/debug/deps/libcore-*.rlib \
253-
target/hexagon-unknown-none-elf/debug/deps/libcompiler_builtins-*.rlib \
252+
target/hexagon-unknown-none-elf/${build_cfg}/libdemo2_hexagon.rlib \
253+
target/hexagon-unknown-none-elf/${build_cfg}/deps/libcore-*.rlib \
254+
target/hexagon-unknown-none-elf/${build_cfg}/deps/libcompiler_builtins-*.rlib \
254255
-Wl,-soname=testit \
255256
${pic_lib_path}/libc.so
256257

0 commit comments

Comments
 (0)