瀏覽代碼

[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 年之前
父節點
當前提交
64e5ca0582
共有 1 個檔案被更改,包括 6 行新增6 行删除
  1. 6
    6
      src/arch/i386/scripts/efi.lds

+ 6
- 6
src/arch/i386/scripts/efi.lds 查看文件

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

Loading…
取消
儲存