* [gentoo-commits] gentoo-x86 commit in sys-apps/memtest86/files: memtest86-4.3.3-build-nopie.patch
@ 2013-10-10 20:53 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-10-10 20:53 UTC (permalink / raw
To: gentoo-commits
blueness 13/10/10 20:53:29
Added: memtest86-4.3.3-build-nopie.patch
Log:
Expand the build patch to include -nopie, bug #206726
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.1 sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch?rev=1.1&content-type=text/plain
Index: memtest86-4.3.3-build-nopie.patch
===================================================================
diff -Naur src.orig/Makefile src/Makefile
--- src.orig/Makefile 2013-10-10 16:52:14.292140058 -0400
+++ src/Makefile 2013-10-10 16:51:37.431138380 -0400
@@ -8,11 +8,9 @@
#
FDISK=/dev/fd0
-AS=as -32
-CC=gcc
+ASFLAGS=-32
-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -nopie $(SMP_FL)
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
config.o memsize.o error.o smp.o cpuid.o vmem.o random.o
@@ -23,7 +21,7 @@
# symbols and then link it dynamically so I have full
# relocation information
memtest_shared: $(OBJS) memtest_shared.lds Makefile
- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
+ $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \
-o $@ $(OBJS) && \
$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
@@ -50,10 +48,10 @@
$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
test.o: test.c
- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
+ $(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
random.o: random.c
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
+ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -nopie random.c
clean:
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
@@ -72,3 +70,7 @@
dos: all
cat mt86+_loader memtest.bin > memtest.exe
+head.o: head.s
+bootsect.o: bootsect.s
+setup.o: setup.s
+
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/memtest86/files: memtest86-4.3.3-build-nopie.patch
@ 2013-10-18 19:13 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-10-18 19:13 UTC (permalink / raw
To: gentoo-commits
blueness 13/10/18 19:13:43
Modified: memtest86-4.3.3-build-nopie.patch
Log:
Fix -fno-pie for bug #487600
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.2 sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch?r1=1.1&r2=1.2
Index: memtest86-4.3.3-build-nopie.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memtest86-4.3.3-build-nopie.patch 10 Oct 2013 20:53:29 -0000 1.1
+++ memtest86-4.3.3-build-nopie.patch 18 Oct 2013 19:13:42 -0000 1.2
@@ -11,7 +11,7 @@
-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -nopie $(SMP_FL)
++CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -fno-pie $(SMP_FL)
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
config.o memsize.o error.o smp.o cpuid.o vmem.o random.o
@@ -33,7 +33,7 @@
random.o: random.c
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -nopie random.c
++ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie random.c
clean:
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-18 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10 20:53 [gentoo-commits] gentoo-x86 commit in sys-apps/memtest86/files: memtest86-4.3.3-build-nopie.patch Anthony G. Basile (blueness)
-- strict thread matches above, loose matches on Subject: below --
2013-10-18 19:13 Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox