@@ -209,17 +209,6 @@ file 'true' do |t|
209209 # 40007a: b8 3c 00 00 00 movl $0x3c, %eax
210210 # 40007f: 0f 05 syscall
211211 entry_point = %w[ 31ffb83c0000000f05 ] . pack ( 'H*' )
212- when 'i386'
213- ei_class = ELF ::ELFCLASS32
214- ei_data = ELF ::ELFDATA2LSB
215- e_machine = 0x03
216- e_flags = 0
217-
218- # 00400054 <PT_LOAD#0>:
219- # 400054: 31 db xorl %ebx, %ebx
220- # 400056: b8 01 00 00 00 movl $0x1, %eax
221- # 40005b: cd 80 int $0x80
222- entry_point = %w[ 31dbb801000000cd80 ] . pack ( 'H*' )
223212 else
224213 raise NotImplementedError
225214 end
@@ -388,9 +377,7 @@ module Platform
388377 ( Platform ::CPU == 'riscv64' &&
389378 File . exist? ( File . absolute_path ( 'lib/ld-linux-riscv64-lp64d.so.1' , root ) ) ) ||
390379 ( Platform ::CPU == 'x86_64' &&
391- File . exist? ( File . absolute_path ( 'lib64/ld-linux-x86-64.so.2' , root ) ) ) ||
392- ( Platform ::CPU == 'i386' &&
393- File . exist? ( File . absolute_path ( 'lib/ld-linux.so.2' , root ) ) )
380+ File . exist? ( File . absolute_path ( 'lib64/ld-linux-x86-64.so.2' , root ) ) )
394381 return 'linux-gnu'
395382 end
396383
@@ -399,7 +386,7 @@ module Platform
399386 return 'linux-gnueabihf'
400387 end
401388
402- if %w[ aarch64 riscv64 x86_64 i386 ] . include? ( Platform ::CPU ) &&
389+ if %w[ aarch64 riscv64 x86_64 ] . include? ( Platform ::CPU ) &&
403390 File . exist? ( File . absolute_path ( "lib/ld-musl-#{ Platform ::CPU } .so.1" , root ) )
404391 return 'linux-musl'
405392 end
@@ -409,10 +396,8 @@ module Platform
409396 return 'linux-musleabihf'
410397 end
411398
412- if ( %w[ aarch64 riscv64 x86_64 ] . include? ( Platform ::CPU ) &&
413- File . exist? ( File . absolute_path ( 'system/bin/linker64' , root ) ) ) ||
414- ( Platform ::CPU == 'i386' &&
415- File . exist? ( File . absolute_path ( 'system/bin/linker' , root ) ) )
399+ if %w[ aarch64 riscv64 x86_64 ] . include? ( Platform ::CPU ) &&
400+ File . exist? ( File . absolute_path ( 'system/bin/linker64' , root ) )
416401 return 'linux-android'
417402 end
418403
0 commit comments