Changeset 2690


Ignore:
Timestamp:
Apr 1, 2006, 10:48:09 PM (19 years ago)
Author:
bird
Message:

#89: wlink defines end, _end, edata and _edata, so split it all up even more so wlink doesn't get upset.

Location:
trunk/emx
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/emx/ChangeLog.emx

    r2689 r2690  
    11/* $Id$ */
     2
     32006-04-01: knut st. osmundsen <bird-gccos2-spam@anduin.net>
     4    - libend:
     5        o #89: wlink defines __end, _end, __edata and _edata, so split
     6          it all up even more so wlink doesn't get upset.
    27
    382006-03-31: knut st. osmundsen <bird-gccos2-spam@anduin.net>

  • trunk/emx/Makefile.kmk

    r2675 r2690  
    7979libend_SOURCES = \
    8080        src/libend/x86/end.asm \
    81         src/libend/x86/endlink386.asm
     81        src/libend/x86/endtext.asm \
     82        src/libend/x86/enddata.asm \
     83        src/libend/x86/endlink386.asm \
     84        src/libend/x86/weakzero.asm
    8285
    8386#

  • trunk/emx/src/libend/386/end.asm

    r1568 r2690  
    11; end.asm (emx+gcc) -- Copyright (c) 1995 by Eberhard Mattes
     2
     3; ilink and link386 uses this, wlink defines both of these.
    24
    35                .386
    46
    5                 PUBLIC  WEAK$ZERO
    6 WEAK$ZERO       =       0
    7 
    8                 ;PUBLIC  _end - ilink defines this.
    9                 ;PUBLIC  _edata  - ilink defines this.
    10                 PUBLIC  _etext
    117                PUBLIC  __end
    128                PUBLIC  __edata
    13                 PUBLIC  __etext
    149
    1510TEXT32          SEGMENT PUBLIC PARA USE32 'CODE'
    1611TEXT32          ENDS
    17 
    1812________TEXT    SEGMENT PUBLIC PARA USE32 'CODE'
    19 __etext         LABEL BYTE
    20 _etext          LABEL BYTE
    2113________TEXT    ENDS
    22 
    2314CGROUP          GROUP TEXT32, ________TEXT
    2415
    … …  
    2617DATA32          SEGMENT PUBLIC PARA USE32 'DATA'
    2718DATA32          ENDS
     19________DATA    SEGMENT PUBLIC PARA USE32 'DATA'
    2820
    29 ________DATA    SEGMENT PUBLIC PARA USE32 'DATA'
    3021__edata         LABEL BYTE
    31 ; _edata          LABEL BYTE - ilink defines this.
     22
    3223________DATA    ENDS
    33 
    34 
    3524c_common        SEGMENT PUBLIC PARA USE32 'BSS'
    3625c_common        ENDS
     26________BSS     SEGMENT PUBLIC PARA USE32 'BSS'
    3727
    38 ________BSS     SEGMENT PUBLIC PARA USE32 'BSS'
    3928__end           LABEL BYTE
    40 ; _end          LABEL BYTE - ilink defines this.
     29
    4130________BSS     ENDS
    42 
    4331DGROUP          GROUP   DATA32, ________DATA, c_common, ________BSS
    4432
    4533                END
     34

  • trunk/emx/src/libend/386/endlink386.asm

    r1568 r2690  
    11; endlink386.asm (emx+gcc) -- Copyright (c) 1995 by Eberhard Mattes
    22
     3; only link386 uses this, both ilink and wlink defines these symbols.
    34                .386
    45
    … …  
    67                PUBLIC  _edata
    78
     9
     10TEXT32          SEGMENT PUBLIC PARA USE32 'CODE'
     11TEXT32          ENDS
     12________TEXT    SEGMENT PUBLIC PARA USE32 'CODE'
     13________TEXT    ENDS
     14CGROUP          GROUP TEXT32, ________TEXT
     15
     16
    817DATA32          SEGMENT PUBLIC PARA USE32 'DATA'
    918DATA32          ENDS
     19________DATA    SEGMENT PUBLIC PARA USE32 'DATA'
    1020
    11 ________DATA    SEGMENT PUBLIC PARA USE32 'DATA'
    1221_edata          LABEL BYTE
     22
    1323________DATA    ENDS
    14 
    15 
    1624c_common        SEGMENT PUBLIC PARA USE32 'BSS'
    1725c_common        ENDS
     26________BSS     SEGMENT PUBLIC PARA USE32 'BSS'
    1827
    19 ________BSS     SEGMENT PUBLIC PARA USE32 'BSS'
    2028_end            LABEL BYTE
     29
    2130________BSS     ENDS
    22 
    2331DGROUP          GROUP   DATA32, ________DATA, c_common, ________BSS
    2432

  • trunk/emx/src/libend/x86/end.asm

    r2479 r2690  
    1 ; end.asm (emx+gcc) -- Copyright (c) 1995 by Eberhard Mattes
    2 ; Converted to NASM -- Copyright (c) 2005 by knut st. osmundsen
     1; $Id: $
     2;; @file
     3;
     4; Define the __end symbols for link386 and ilink.
     5;
     6; Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
     7;
     8;
     9; This file is part of kLIBC.
     10;
     11; kLIBC is free software; you can redistribute it and/or modify
     12; it under the terms of the GNU Lesser General Public License as published
     13; by the Free Software Foundation; either version 2 of the License, or
     14; (at your option) any later version.
     15;
     16; kLIBC is distributed in the hope that it will be useful,
     17; but WITHOUT ANY WARRANTY; without even the implied warranty of
     18; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19; GNU Lesser General Public License for more details.
     20;
     21; You should have received a copy of the GNU Lesser General Public License
     22; along with kLIBC; if not, write to the Free Software
     23; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     24;
     25;
    326
    4 
    5 ABSOLUTE 0
    6 global WEAK$ZERO
    7 WEAK$ZERO:
    8 
    9 global  _etext
    1027global  __end
    11 global  __edata
    12 global  __etext
    1328
    1429segment TEXT32 public align=16 use32 class=CODE FLAT
    1530segment ________TEXT public align=16 use32 class=CODE FLAT
    16 __etext:
    17 _etext:
    1831group CGROUP TEXT32 ________TEXT
    1932
    2033segment DATA32 public align=16 use32 class=DATA FLAT
    2134segment ________DATA public align=16 use32 class=DATA FLAT
    22 __edata:
    23 
    2435segment c_common public align=16 use32 class=BSS FLAT
    2536segment ________BSS public align=16 use32 class=BSS FLAT
    2637__end:
    27 
    2838group DGROUP DATA32 ________DATA c_common ________BSS
    2939

  • trunk/emx/src/libend/x86/endlink386.asm

    r2479 r2690  
    1 ; endlink386.asm (emx+gcc) -- Copyright (c) 1995 by Eberhard Mattes
    2 ; Converted to NASM -- Copyright (c) 2005 by knut st. osmundsen
    3 
     1; $Id$
     2;; @file
     3;
     4; Define the _edata and _end symbols for the link386 linker.
     5;
     6; Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
     7;
     8;
     9; This file is part of kLIBC.
     10;
     11; kLIBC is free software; you can redistribute it and/or modify
     12; it under the terms of the GNU Lesser General Public License as published
     13; by the Free Software Foundation; either version 2 of the License, or
     14; (at your option) any later version.
     15;
     16; kLIBC is distributed in the hope that it will be useful,
     17; but WITHOUT ANY WARRANTY; without even the implied warranty of
     18; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19; GNU Lesser General Public License for more details.
     20;
     21; You should have received a copy of the GNU Lesser General Public License
     22; along with kLIBC; if not, write to the Free Software
     23; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     24;
     25;
    426
    527global _end
    628global _edata
    729
     30segment TEXT32 public align=16 use32 class=CODE FLAT
     31segment ________TEXT public align=16 use32 class=CODE FLAT
     32group CGROUP TEXT32 ________TEXT
     33
    834segment DATA32 public align=16 use32 class=DATA FLAT
    935segment ________DATA public align=16 use32 class=DATA FLAT
    1036_edata:
    11 
    1237segment c_common public align=16 use32 class=BSS FLAT
    1338segment ________BSS public align=16 use32 class=BSS FLAT
    14 _end:
    15 
     39;_end:
    1640group DGROUP DATA32 ________DATA c_common ________BSS
    1741
Note: See TracChangeset for help on using the changeset viewer.