Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset bd29f9c9 in mainline for uspace/srv/loader/interp.S


Ignore:
Timestamp:
2012-07-30T20:01:02Z (9 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
Children:
542e819, beb9336
Parents:
c15849c (diff), 597b12e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/loader/interp.S

    rc15849c rbd29f9c9  
    55#
    66
    7 #ifdef UARCH_arm32
    8 #define AT_NOTE %note
    9 #else
    10 #define AT_NOTE @note
     7#if ((defined(UARCH_abs32le)) && (defined(COMPILER_gcc_cross)) \
     8    && (defined(CROSS_TARGET_arm32)))
     9        #define ATSIGN(arg)  % ## arg
    1110#endif
    1211
    13 .section .interp, "a", AT_NOTE
     12#ifdef UARCH_arm32
     13        #define ATSIGN(arg)  % ## arg
     14#endif
     15
     16#ifndef ATSIGN
     17        #define ATSIGN(arg)  @ ## arg
     18#endif
     19
     20.section .interp, "a", ATSIGN(progbits)
    1421        .string "kernel"
Note: See TracChangeset for help on using the changeset viewer.