Changeset afdcc60e in mainline

Timestamp:

2011-04-29T16:15:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

30c4005, 3f461ecf, bae7bdc

Parents:

933cadf

Message:

Link with -n (nmagic) instead of -N (omagic). omagic makes text sections
writable, which is wrong and breaks dynamic linking of variables
(since it makes the link editor put relocations in the text section
instead of the GOT).

Files:

• boot/Makefile.build (modified) (1 diff)
• kernel/Makefile (modified) (1 diff)
• uspace/Makefile.common (modified) (1 diff)

boot/Makefile.build

@@ -111 +111 @@
 
 $(RAW): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
-        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
+        $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
 
 $(LINK): $(LINK).comp $(DEPEND)

kernel/Makefile

@@ -134 +134 @@
 #
 AFLAGS =
-LFLAGS = -N -T $(LINK) -M
+LFLAGS = -n -T $(LINK) -M
 
 #

uspace/Makefile.common

@@ -185 +185 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -N $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)