Browse Source

changed sbrk to fc_sbrk, to avoid conflicts with C library.

michael 27 years ago
parent
commit
bc48fd107d
5 changed files with 13 additions and 10 deletions
  1. 1 1
      rtl/linux/i386/gprt0.as
  2. 1 1
      rtl/linux/i386/gprt1.as
  3. 1 1
      rtl/linux/i386/prt0.as
  4. 4 4
      rtl/linux/i386/prt1.as
  5. 6 3
      rtl/linux/syslinux.pp

+ 1 - 1
rtl/linux/i386/gprt0.as

@@ -59,7 +59,7 @@ _haltproc:
 	.globl	___brk_addr
 	.type	___brk_addr,@object
 	.size	___brk_addr,4
-___brk_addr:
+___fpc_brk_addr:
 	.long	0
 	
 	.globl	__curbrk		/* necessary for libc */

+ 1 - 1
rtl/linux/i386/gprt1.as

@@ -66,7 +66,7 @@ _haltproc:
 	.globl	___brk_addr		/* heap management */
 	.type	___brk_addr,@object
 	.size	___brk_addr,4
-___brk_addr:
+___fpc_brk_addr:
 	.long	0
 	
 	.globl	__curbrk		/* necessary for libc */

+ 1 - 1
rtl/linux/i386/prt0.as

@@ -44,5 +44,5 @@ _haltproc:
 	.globl	___brk_addr
 	.type	___brk_addr,@object
 	.size	___brk_addr,4
-___brk_addr:
+___fpc_brk_addr:
 	.long	0

+ 4 - 4
rtl/linux/i386/prt1.as

@@ -48,10 +48,10 @@ _haltproc:
 .data
 	.align	4
 	
-	.globl	___brk_addr		/* heap management */
-	.type	___brk_addr,@object
-	.size	___brk_addr,4
-___brk_addr:
+	.globl	___fpc_brk_addr		/* heap management */
+	.type	___fpc_brk_addr,@object
+	.size	___fpc_brk_addr,4
+___fpc_brk_addr:
 	.long	0
 	
 	.globl	__curbrk		/* necessary for libc */

+ 6 - 3
rtl/linux/syslinux.pp

@@ -158,7 +158,7 @@ End;
 Function Get_Brk_addr : longint;assembler;
 {$ifdef i386}
 asm
-        movl    ___brk_addr,%eax
+        movl    ___fpc_brk_addr,%eax
 end ['EAX'];
 {$endif}
 
@@ -167,7 +167,7 @@ Procedure Set_brk_addr (NewAddr : longint);assembler;
 {$ifdef i386}
 asm
         movl    NewAddr,%eax
-        movl    %eax,___brk_addr
+        movl    %eax,___fpc_brk_addr
 end ['EAX'];
 {$endif}
 
@@ -675,7 +675,10 @@ End.
 
 {
   $Log$
-  Revision 1.8  1998-07-13 21:19:14  florian
+  Revision 1.9  1998-07-20 23:40:20  michael
+  changed sbrk to fc_sbrk, to avoid conflicts with C library.
+
+  Revision 1.8  1998/07/13 21:19:14  florian
     * some problems with ansi string support fixed
 
   Revision 1.7  1998/07/02 12:36:21  carl