diff options
| author | Simon Rettberg | 2023-10-06 18:37:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-10-06 18:37:21 +0200 |
| commit | 95a57769874a70456670984debc05084feb75f6b (patch) | |
| tree | 9943c86b682e1b1d21a0439637b3849840a50137 /src/arch/x86/prefix | |
| parent | [efi] Remove old RDRAND hack; now officially supported (diff) | |
| parent | [libc] Use wall clock time as seed for the (non-cryptographic) RNG (diff) | |
| download | ipxe-95a57769874a70456670984debc05084feb75f6b.tar.gz ipxe-95a57769874a70456670984debc05084feb75f6b.tar.xz ipxe-95a57769874a70456670984debc05084feb75f6b.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/arch/x86/prefix')
| -rw-r--r-- | src/arch/x86/prefix/bootpart.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/dskprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/exeprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/hdprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/libprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/lkrnprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/mbr.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/mromprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/nbiprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/nullprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/pxeprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/rawprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/romprefix.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/undiloader.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/unlzma.S | 1 | ||||
| -rw-r--r-- | src/arch/x86/prefix/usbdisk.S | 1 |
16 files changed, 16 insertions, 0 deletions
diff --git a/src/arch/x86/prefix/bootpart.S b/src/arch/x86/prefix/bootpart.S index 6d0c6034..575cb1c0 100644 --- a/src/arch/x86/prefix/bootpart.S +++ b/src/arch/x86/prefix/bootpart.S @@ -5,6 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define STACK_SEG 0x0200 #define STACK_SIZE 0x2000 + .section ".note.GNU-stack", "", @progbits .text .arch i386 .section ".prefix", "awx", @progbits diff --git a/src/arch/x86/prefix/dskprefix.S b/src/arch/x86/prefix/dskprefix.S index 0503f113..bc194887 100644 --- a/src/arch/x86/prefix/dskprefix.S +++ b/src/arch/x86/prefix/dskprefix.S @@ -24,6 +24,7 @@ FILE_LICENCE ( GPL2_ONLY ) .equ SYSSEG, 0x1000 /* system loaded at SYSSEG<<4 */ + .section ".note.GNU-stack", "", @progbits .org 0 .arch i386 .text diff --git a/src/arch/x86/prefix/exeprefix.S b/src/arch/x86/prefix/exeprefix.S index 0eab8c12..5b2605e8 100644 --- a/src/arch/x86/prefix/exeprefix.S +++ b/src/arch/x86/prefix/exeprefix.S @@ -36,6 +36,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define PSP_CMDLINE_LEN 0x80 #define PSP_CMDLINE_START 0x81 + .section ".note.GNU-stack", "", @progbits .text .arch i386 .org 0 diff --git a/src/arch/x86/prefix/hdprefix.S b/src/arch/x86/prefix/hdprefix.S index 28c8a532..fbf8d2e4 100644 --- a/src/arch/x86/prefix/hdprefix.S +++ b/src/arch/x86/prefix/hdprefix.S @@ -2,6 +2,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #include <librm.h> + .section ".note.GNU-stack", "", @progbits .text .arch i386 .section ".prefix", "awx", @progbits diff --git a/src/arch/x86/prefix/libprefix.S b/src/arch/x86/prefix/libprefix.S index d7f26195..380e471d 100644 --- a/src/arch/x86/prefix/libprefix.S +++ b/src/arch/x86/prefix/libprefix.S @@ -26,6 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #include <librm.h> + .section ".note.GNU-stack", "", @progbits .arch i386 /* Image compression enabled */ diff --git a/src/arch/x86/prefix/lkrnprefix.S b/src/arch/x86/prefix/lkrnprefix.S index 922181f0..2c17f79d 100644 --- a/src/arch/x86/prefix/lkrnprefix.S +++ b/src/arch/x86/prefix/lkrnprefix.S @@ -4,6 +4,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define BZI_LOAD_HIGH_ADDR 0x100000 + .section ".note.GNU-stack", "", @progbits .text .arch i386 .code16 diff --git a/src/arch/x86/prefix/mbr.S b/src/arch/x86/prefix/mbr.S index 032c0e77..928bb338 100644 --- a/src/arch/x86/prefix/mbr.S +++ b/src/arch/x86/prefix/mbr.S @@ -1,5 +1,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) + .section ".note.GNU-stack", "", @progbits .text .arch i386 .section ".prefix", "awx", @progbits diff --git a/src/arch/x86/prefix/mromprefix.S b/src/arch/x86/prefix/mromprefix.S index d08284d7..5f3496b2 100644 --- a/src/arch/x86/prefix/mromprefix.S +++ b/src/arch/x86/prefix/mromprefix.S @@ -41,6 +41,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define _pcirom_start _mrom_start #include "pciromprefix.S" + .section ".note.GNU-stack", "", @progbits .text .arch i386 .code16 diff --git a/src/arch/x86/prefix/nbiprefix.S b/src/arch/x86/prefix/nbiprefix.S index de38e4af..cae1009b 100644 --- a/src/arch/x86/prefix/nbiprefix.S +++ b/src/arch/x86/prefix/nbiprefix.S @@ -2,6 +2,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #include <librm.h> + .section ".note.GNU-stack", "", @progbits .text .arch i386 .code16 diff --git a/src/arch/x86/prefix/nullprefix.S b/src/arch/x86/prefix/nullprefix.S index bd0ff339..1568188d 100644 --- a/src/arch/x86/prefix/nullprefix.S +++ b/src/arch/x86/prefix/nullprefix.S @@ -1,5 +1,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) + .section ".note.GNU-stack", "", @progbits .org 0 .text .arch i386 diff --git a/src/arch/x86/prefix/pxeprefix.S b/src/arch/x86/prefix/pxeprefix.S index 52ea1803..494fbc13 100644 --- a/src/arch/x86/prefix/pxeprefix.S +++ b/src/arch/x86/prefix/pxeprefix.S @@ -11,6 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define PXE_HACK_EB54 0x0001 + .section ".note.GNU-stack", "", @progbits .text .arch i386 .org 0 diff --git a/src/arch/x86/prefix/rawprefix.S b/src/arch/x86/prefix/rawprefix.S index 4cf5f391..4a3d3504 100644 --- a/src/arch/x86/prefix/rawprefix.S +++ b/src/arch/x86/prefix/rawprefix.S @@ -8,6 +8,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) + .section ".note.GNU-stack", "", @progbits .text .arch i386 .org 0 diff --git a/src/arch/x86/prefix/romprefix.S b/src/arch/x86/prefix/romprefix.S index 4e8793c2..79fed2a3 100644 --- a/src/arch/x86/prefix/romprefix.S +++ b/src/arch/x86/prefix/romprefix.S @@ -54,6 +54,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #define BUSTYPE "PCIR" #endif + .section ".note.GNU-stack", "", @progbits .text .code16 .arch i386 diff --git a/src/arch/x86/prefix/undiloader.S b/src/arch/x86/prefix/undiloader.S index 1d77110e..e544d504 100644 --- a/src/arch/x86/prefix/undiloader.S +++ b/src/arch/x86/prefix/undiloader.S @@ -2,6 +2,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #include <librm.h> + .section ".note.GNU-stack", "", @progbits .text .code16 .arch i386 diff --git a/src/arch/x86/prefix/unlzma.S b/src/arch/x86/prefix/unlzma.S index 979f699e..f4bd81bd 100644 --- a/src/arch/x86/prefix/unlzma.S +++ b/src/arch/x86/prefix/unlzma.S @@ -43,6 +43,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); **************************************************************************** */ + .section ".note.GNU-stack", "", @progbits .text .arch i486 .section ".prefix.lib", "ax", @progbits diff --git a/src/arch/x86/prefix/usbdisk.S b/src/arch/x86/prefix/usbdisk.S index 977de6dd..461a0837 100644 --- a/src/arch/x86/prefix/usbdisk.S +++ b/src/arch/x86/prefix/usbdisk.S @@ -2,6 +2,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ) #include <config/console.h> + .section ".note.GNU-stack", "", @progbits .text .arch i386 .section ".prefix", "awx", @progbits |