Changeset 30c4005 in mainline for boot


Ignore:
Timestamp:
2011-04-29T19:56:07Z (15 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2874547
Parents:
6b40ea7 (diff), afdcc60e (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 mainline improvements

Location:
boot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    r6b40ea7 r30c4005  
    111111
    112112$(RAW): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
    113         $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
     113        $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
    114114
    115115$(LINK): $(LINK).comp $(DEPEND)

  • boot/arch/ia64/_link.ld.in

    r6b40ea7 r30c4005  
    1111                *(.rodata);
    1212                *(.rodata.*);
    13                 *(.data);               /* initialized data */
    14                 _got = . ;
     13                *(.data .data.*);       /* initialized data */
     14                __gp = . ;
    1515                *(.got .got.*);
    1616                *(.bss);                /* uninitialized static variables */
    … …  
    2020
    2121        /DISCARD/ : {
    22                 *(.comment);
    23                 *(.note*);
     22                *(.*);
    2423        }
    2524}

  • boot/arch/ia64/src/boot.S

    r6b40ea7 r30c4005  
    3434.global start
    3535start:
    36         movl gp = LOADER_ADDRESS
     36        movl gp = __gp
    3737
    3838        #
Note: See TracChangeset for help on using the changeset viewer.