From 91696f07a20c66058fb6b0b005e6a7a921663eb1 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 3 Jan 2017 19:35:09 +0100 Subject: [PATCH] Added -fstack-protector-strong -pie -fPIE flags for stack protection. --- src/Makefile.mingw | 4 ++-- src/Makefile.mingw64 | 4 ++-- src/Makefile_AMD.mingw | 2 +- src/Makefile_AMD.mingw64 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.mingw b/src/Makefile.mingw index fc210da6e..821a197a8 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -2,8 +2,8 @@ VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign +CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -fstack-protector-strong -pie -fPIE +DFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign -fstack-protector-strong -pie -fPIE OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429.o amstrad.o buslogic.o cdrom-ioctl.o cdrom-iso.o \ cdrom-null.o codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_86f.o disc_fdi.o disc_imd.o disc_img.o disc_random.o disc_td0.o dma.o fdc.o fdc37c665.o fdc37c932fr.o fdd.o fdi2raw.o gameport.o headland.o i430hx.o i430lx.o i430fx.o \ diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64 index 87d95a549..ccc2d200c 100644 --- a/src/Makefile.mingw64 +++ b/src/Makefile.mingw64 @@ -2,8 +2,8 @@ VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DFLAGS = -O3 -fomit-frame-pointer -msse2 +CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -fstack-protector-strong -pie -fPIE +DFLAGS = -O3 -fomit-frame-pointer -msse2 -mstackrealign -fstack-protector-strong -pie -fPIE OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429.o amstrad.o buslogic.o cdrom-ioctl.o cdrom-iso.o \ cdrom-null.o codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86-64.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_86f.o disc_fdi.o disc_imd.o disc_img.o disc_random.o disc_td0.o dma.o fdc.o fdc37c665.o fdc37c932fr.o fdd.o fdi2raw.o gameport.o headland.o i430hx.o i430lx.o i430fx.o \ diff --git a/src/Makefile_AMD.mingw b/src/Makefile_AMD.mingw index 436b11d5f..2691ddbbc 100644 --- a/src/Makefile_AMD.mingw +++ b/src/Makefile_AMD.mingw @@ -1,2 +1,2 @@ include Makefile.mingw -CFLAGS = -O3 -march=amdfam10 -mtune=amdfam10 -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mfpmath=sse -mstackrealign \ No newline at end of file +CFLAGS = -O3 -march=amdfam10 -mtune=amdfam10 -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mfpmath=sse -mstackrealign -fstack-protector-strong -pie -fPIE \ No newline at end of file diff --git a/src/Makefile_AMD.mingw64 b/src/Makefile_AMD.mingw64 index d891ed4a4..0e4c5e799 100644 --- a/src/Makefile_AMD.mingw64 +++ b/src/Makefile_AMD.mingw64 @@ -1,2 +1,2 @@ include Makefile.mingw64 -CFLAGS = -O3 -march=amdfam10 -mtune=amdfam10 -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mfpmath=sse -mstackrealign \ No newline at end of file +CFLAGS = -O3 -march=amdfam10 -mtune=amdfam10 -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mfpmath=sse -mstackrealign -fstack-protector-strong -pie -fPIE \ No newline at end of file