Browse Source

[efi] Fix linker script for ld 2.17.50.0.9

Some versions of ld choke on the "AT ( _xxx_lma )" in efi.lds with an
error saying "nonconstant expression for load base".  Since these were
only explicitly setting the LMA to the address that it would have had
anyway, they can be safely omitted.
tags/v0.9.6
Michael Brown 15 years ago
parent
commit
64e5ca0582
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      src/arch/i386/scripts/efi.lds

+ 6
- 6
src/arch/i386/scripts/efi.lds View File

23
      *
23
      *
24
      */
24
      */
25
 
25
 
26
-    .prefix : AT ( _prefix_lma ) {
26
+    .prefix : {
27
 	_prefix = .;
27
 	_prefix = .;
28
 	*(.prefix)
28
 	*(.prefix)
29
 	*(.prefix.*)
29
 	*(.prefix.*)
40
      */
40
      */
41
 
41
 
42
     . = ALIGN ( _max_align );
42
     . = ALIGN ( _max_align );
43
-    .text : AT ( _text_lma ) {
43
+    .text : {
44
 	_text = .;
44
 	_text = .;
45
 	*(.text)
45
 	*(.text)
46
 	*(.text.*)
46
 	*(.text.*)
57
      */
57
      */
58
 
58
 
59
     . = ALIGN ( _max_align );
59
     . = ALIGN ( _max_align );
60
-    .rodata : AT ( _rodata_lma ) {
60
+    .rodata : {
61
 	_rodata = .;
61
 	_rodata = .;
62
 	*(.rodata)
62
 	*(.rodata)
63
 	*(.rodata.*)
63
 	*(.rodata.*)
74
      */
74
      */
75
 
75
 
76
     . = ALIGN ( _max_align );
76
     . = ALIGN ( _max_align );
77
-    .data : AT ( _data_lma ) {
77
+    .data : {
78
 	_data = .;
78
 	_data = .;
79
 	*(.data)
79
 	*(.data)
80
 	*(.data.*)
80
 	*(.data.*)
98
      */
98
      */
99
 
99
 
100
     . = ALIGN ( _max_align );
100
     . = ALIGN ( _max_align );
101
-    .bss : AT ( _bss_lma ) {
101
+    .bss : { 
102
 	_bss = .;
102
 	_bss = .;
103
 	/* EFI seems to not support proper bss sections */
103
 	/* EFI seems to not support proper bss sections */
104
 	_mbss = .;
104
 	_mbss = .;
114
      */
114
      */
115
 
115
 
116
     . = ALIGN ( _max_align );
116
     . = ALIGN ( _max_align );
117
-    .reloc : AT ( _reloc_lma ) {
117
+    .reloc : {
118
 	_reloc = .;
118
 	_reloc = .;
119
 	/* Provide some dummy contents to force ld to include this
119
 	/* Provide some dummy contents to force ld to include this
120
 	 * section.  It will be created by the efilink utility.
120
 	 * section.  It will be created by the efilink utility.

Loading…
Cancel
Save