update to rm2

This commit is contained in:
Anton-4 2023-01-21 19:02:40 +01:00
parent 7d6426b280
commit cc67c75d39
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
3 changed files with 4 additions and 4 deletions

View file

@ -24,13 +24,13 @@ jobs:
# does a build with the surgical linker and also with the legacy linker
- run: ./ci/build_basic_cli.sh linux_x86_64 "--linker legacy"
- name: Save .rh1, .rm1 and .o file
- name: Save .rh1, .rm2 and .o file
uses: actions/upload-artifact@v3
with:
name: linux-x86_64-files
path: |
basic-cli/src/metadata_linux-x86_64.rm2
basic-cli/src/linux-x86_64.rh1
basic-cli/src/metadata_linux-x86_64.rm1
basic-cli/src/linux-x86_64.o
build-macos-x86_64-files:

View file

@ -96,7 +96,7 @@ pub fn build_and_preprocess_host(
fn metadata_file_name(target: &Triple) -> String {
let target_triple_str = get_target_triple_str(target);
format!("metadata_{}.rm1", target_triple_str.unwrap_or("unknown"))
format!("metadata_{}.rm2", target_triple_str.unwrap_or("unknown"))
}
pub fn link_preprocessed_host(

View file

@ -153,7 +153,7 @@ fn write_archive<W: Write>(path: &Path, writer: W) -> io::Result<()> {
// surgical linker format
Some("rh1"),
// metadata file
Some("rm1"),
Some("rm2"),
// legacy linker formats
Some("o"),
Some("obj"),