Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/include/os2sel.h

    r21350 r21916  
    3636
    3737#ifndef __WATCOMC__
    38 #ifdef  __EMX__
     38#if defined(__GNUC__)
     39// note that we also define the exported variants of these in asmutil.asm
    3940static inline unsigned short GetFS(void)
    4041{
    … …  
    4950}
    5051
    51 static inline int RestoreOS2FS(void)
     52static inline short RestoreOS2FS(void)
    5253{
    5354 int __res, xx = 0x0150b;
    … …  
    6061}
    6162
     63static inline short SetReturnFS(unsigned short sel)
     64{
     65 int __res;
     66
     67 __asm__ __volatile__(
     68   "mov   %%fs,%0      \n\t"
     69   "mov   %%eax,%%fs   \n\t"
     70   : "=&r" (__res) : "a" (sel));
     71 return(__res);
     72}
    6273
    6374#else
    … …  
    6778void           _System SetFS       (unsigned short selector);
    6879unsigned short _System SetReturnFS (unsigned short selector);
    69 //SvL: Checks if thread FS & exception structure are valid
    70 int            _System CheckCurFS(void);
    7180#endif
    7281#endif
    7382
    74  
    75  
     83//SvL: Checks if thread FS & exception structure are valid
     84int            _System CheckCurFS(void);
     85
     86
    7687#ifdef __cplusplus
    7788}
Note: See TracChangeset for help on using the changeset viewer.