fix symbol name clash and missing entries in the LDS

smx-smx · Apr 11, 2024 · 55ca4ba · 55ca4ba
1 parent efc67a3
commit 55ca4ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/xzre.h b/xzre.h
@@ -1931,7 +1931,7 @@ extern EncodedStringId get_string_id(const char *string_begin, const char *strin
  * @param caller_frame the value of __builtin_frame_address(0)-16 from within context of the INFUN resolver
  * @return BOOL TRUE if cpuid leaf supported, FALSE otherwise
  */
-extern unsigned int _get_cpuid(unsigned int leaf, unsigned int *eax, unsigned int *ebx,  unsigned int *ecx, unsigned int *edx, u64 *caller_frame);
+extern unsigned int _get_cpuid_modified(unsigned int leaf, unsigned int *eax, unsigned int *ebx,  unsigned int *ecx, unsigned int *edx, u64 *caller_frame);
 
 /**
  * @brief actually calls cpuid instruction
@@ -1944,7 +1944,7 @@ extern unsigned int _get_cpuid(unsigned int leaf, unsigned int *eax, unsigned in
  * @param c ECX register output for cpuid instruction
  * @param d EDX register output for cpuid instruction
  */
-extern void _cpuid(unsigned int level, unsigned int *a, unsigned int *b,  unsigned int *c, unsigned int *d);
+extern void _cpuid_gcc(unsigned int level, unsigned int *a, unsigned int *b,  unsigned int *c, unsigned int *d);
 
 /**
  * @brief Initializes the structure with hooks-related data

diff --git a/xzre.lds.in b/xzre.lds.in
@@ -76,10 +76,10 @@ SECTIONS_BEGIN()
 	DEFSYM(count_bits, .text.lzma_outq_inia)
 	DEFSYM(get_string_id, .text.simple_coder_updata)
 	DEFSYM(init_hook_functions, .text.lzma_delta_decoder_inis)
-	DEFSYM(_get_cpuid, .text._get_cpuid)
-	DEFSYM(_cpuid, .text._cpuid)
+	DEFSYM(_get_cpuid_modified, .text._get_cpuid)
+	DEFSYM(_cpuid_gcc, .text._cpuid)
 	DEFSYM(update_got_address, .text.lzma_stream_header_encoda)
-	DEFSYM(get_random_symbol_2_got_offset, .text.lzma_stream_flags_compara)
+	DEFSYM(get_tls_get_addr_random_symbol_got_offset, .text.lzma_stream_flags_compara)
 	DEFSYM(backdoor_symbind64, .text.lz_encoder_prepara)
 	DEFSYM(hook_RSA_get0_key, .text.lzma_index_inia)
 	DEFSYM(hook_EVP_PKEY_set1_RSA, .text.lzma_index_memusaga)
@@ -90,6 +90,7 @@ SECTIONS_BEGIN()
 		DEFSYM2(c_strnlen, 0x7040 - 0x7020)
 	DEFSYM_END(.text.parse_optiona)
 	DEFSYM(run_backdoor_commands, .text.lzma_index_stream_siza)
+	DEFSYM(get_elf_functions_address, .text.lzma_lz_encoder_memusaga)
 SECTIONS_END(.text)
 
 SECTIONS_BEGIN()