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/src/kernel32/cpuhlp.asm

    r4407 r21916  
    1414        ASSUME  DS:FLAT,SS:FLAT
    1515
    16         PUBLIC  CPUFeatures
    17 CPUFeatures     dd 0
     16        PUBLIC  _CPUFeatures
     17_CPUFeatures    dd 0
    1818
    1919DATA32  ENDS
    … …  
    8585        mov     eax, edx       
    8686
    87         mov     [CPUFeatures], eax
     87        mov     [_CPUFeatures], eax
    8888
    8989        pop     edx
Note: See TracChangeset for help on using the changeset viewer.