Browse Source

* x86_64-linux startup: use ABI tag from abitag.o, cleaned out inlined versions.

git-svn-id: trunk@29578 -
sergei 10 years ago
parent
commit
50639d89e7
2 changed files with 3 additions and 33 deletions
  1. 1 16
      rtl/linux/x86_64/si_c.inc
  2. 2 17
      rtl/linux/x86_64/si_prc.inc

+ 1 - 16
rtl/linux/x86_64/si_c.inc

@@ -33,6 +33,7 @@
          argc <--- esp
 }
 
+{$L abitag.o}
 var
   libc_environ: pchar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
@@ -134,22 +135,6 @@ procedure _FPC_libc_start; assembler; nostackframe; public name '_start';
     call libc_start_main
 
     hlt                     { Crash if somehow `exit' does return.  }
-
-    { We need this stuff to make gdb behave itself, otherwise
-      gdb will chokes with SIGILL when trying to debug apps.
-    }
-(*
-    .section ".note.ABI-tag", "a"
-    .align 4
-    .long 1f - 0f
-    .long 3f - 2f
-    .long  1
-0:  .asciz "GNU"
-1:  .align 4
-2:  .long 0
-    .long 2,4,0
-3:  .align 4
- *)
   end;
 
 

+ 2 - 17
rtl/linux/x86_64/si_prc.inc

@@ -31,6 +31,8 @@
 					NULL
 }
 
+{$L abitag.o}
+
 procedure PASCALMAIN; external name 'PASCALMAIN';
 
 {******************************************************************************
@@ -85,22 +87,5 @@ procedure _FPC_proc_haltproc(e: longint); assembler; public name '_haltproc';
     movl    code,%edi
     syscall
     jmp     .Lhaltproc
-
-    { We need this stuff to make gdb behave itself, otherwise
-      gdb will chokes with SIGILL when trying to debug apps.
-    }
-(*
-    .section ".note.ABI-tag", "a"
-    .align 4
-    .long 1f - 0f
-    .long 3f - 2f
-    .long  1
-0:  .asciz "GNU"
-1:  .align 4
-2:  .long 0
-    .long 2,4,0
-3:  .align 4
-
-    .section	.note.GNU-stack,"",@progbits *)
   end;