Remove confusing statement

pull/110/head
Andre Richter 3 years ago
parent b4ed84dd77
commit c0da8ab1b7
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E

@ -186,7 +186,7 @@ diff -uNr 01_wait_forever/src/bsp/raspberrypi/cpu.rs 02_runtime_init/src/bsp/ras
diff -uNr 01_wait_forever/src/bsp/raspberrypi/link.ld 02_runtime_init/src/bsp/raspberrypi/link.ld
--- 01_wait_forever/src/bsp/raspberrypi/link.ld
+++ 02_runtime_init/src/bsp/raspberrypi/link.ld
@@ -11,17 +11,52 @@
@@ -11,17 +11,45 @@
PHDRS
{
segment_rx PT_LOAD FLAGS(5); /* 5 == RX */
@ -209,16 +209,9 @@ diff -uNr 01_wait_forever/src/bsp/raspberrypi/link.ld 02_runtime_init/src/bsp/ra
.text :
{
KEEP(*(.text._start))
+
+ /* Special constants (or statics in Rust speak) needed by _start().
+ *
+ * They are placed in close proximity to _start() from where they will be read. This ensures
+ * that position-independent, PC-relative loads can be emitted.
+ */
+ *(.text._start_arguments)
+
+ *(.text._start_rust) /* The Rust entry point */
+ *(.text*) /* Everything else */
+ *(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
+ *(.text._start_rust) /* The Rust entry point */
+ *(.text*) /* Everything else */
} :segment_rx
+
+ .rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -315,7 +315,7 @@ diff -uNr 05_drivers_gpio_uart/src/bsp/raspberrypi/link.ld 06_uart_chainloader/s
.text :
{
KEEP(*(.text._start))
@@ -49,8 +51,12 @@
@@ -42,8 +44,12 @@
***********************************************************************************************/
.data : { *(.data*) } :segment_rw

@ -31,16 +31,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -398,7 +398,7 @@ diff -uNr 06_uart_chainloader/src/bsp/raspberrypi/link.ld 07_timestamps/src/bsp/
.text :
{
KEEP(*(.text._start))
@@ -51,12 +49,8 @@
@@ -44,12 +42,8 @@
***********************************************************************************************/
.data : { *(.data*) } :segment_rw

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -821,7 +821,7 @@ diff -uNr 09_privilege_level/src/bsp/raspberrypi/link.ld 10_virtual_mem_part1_id
.text :
{
KEEP(*(.text._start))
@@ -44,6 +45,9 @@
@@ -37,6 +38,9 @@
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx
.got : ALIGN(8) { *(.got) } :segment_rx

@ -30,16 +30,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -30,16 +30,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -30,16 +30,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -30,16 +30,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -1468,7 +1468,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld 14_vir
/***********************************************************************************************
* Code + RO Data + Global Offset Table
@@ -51,6 +46,7 @@
@@ -44,6 +39,7 @@
/***********************************************************************************************
* Data + BSS
***********************************************************************************************/
@ -1476,7 +1476,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld 14_vir
.data : { *(.data*) } :segment_rw
/* Section is zeroed in u64 chunks, align start and end to 8 bytes */
@@ -63,4 +59,23 @@
@@ -56,4 +52,23 @@
. += 8; /* Fill for the bss == 0 case, so that __bss_start <= __bss_end_inclusive holds */
__bss_end_inclusive = . - 8;
} :NONE

@ -25,16 +25,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

@ -29,16 +29,9 @@ SECTIONS
.text :
{
KEEP(*(.text._start))
/* Special constants (or statics in Rust speak) needed by _start().
*
* They are placed in close proximity to _start() from where they will be read. This ensures
* that position-independent, PC-relative loads can be emitted.
*/
*(.text._start_arguments)
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
*(.text._start_arguments) /* Constants (or statics in Rust speak) read by _start(). */
*(.text._start_rust) /* The Rust entry point */
*(.text*) /* Everything else */
} :segment_rx
.rodata : ALIGN(8) { *(.rodata*) } :segment_rx

Loading…
Cancel
Save