From 02acf554c3f4b43a6cf751568e746848ed464896 Mon Sep 17 00:00:00 2001
From: daidai_is_here <daiqianwen@huawei.com>
Date: Mon, 13 Jan 2020 10:23:20 +0800
Subject: [PATCH] add build flags

---
 acpica-tools.spec      |  1 +
 openEuler-harden.patch | 51 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 openEuler-harden.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 69f5cc4..28170cf 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -13,6 +13,7 @@ Source2:        COPYING
 Patch0001:      cve-2017-13693.patch
 Patch0002:      cve-2017-13694.patch
 Patch0003:      cve-2017-13695.patch
+Patch0004:      openEuler-harden.patch
 
 BuildRequires:  bison patchutils flex gcc
 Provides:       acpixtract >= 20120913-7 iasl = %{version}-%{release} acpidump >= 20100513-5
diff --git a/openEuler-harden.patch b/openEuler-harden.patch
new file mode 100644
index 0000000..dfe970a
--- /dev/null
+++ b/openEuler-harden.patch
@@ -0,0 +1,51 @@
+Index: acpica-unix2-20180209/generate/unix/Makefile.config
+===================================================================
+--- acpica-unix2-20180209.orig/generate/unix/Makefile.config
++++ acpica-unix2-20180209/generate/unix/Makefile.config
+@@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE)
+ OPT_CFLAGS += -D_FORTIFY_SOURCE=2
+ endif
+ 
++OPT_CFLAGS += -fPIC -pie
++
+ CFLAGS += \
+     -D$(HOST)\
+     -D_GNU_SOURCE\
+Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
+===================================================================
+--- acpica-unix2-20180209.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20180209/generate/unix/iasl/Makefile
+@@ -344,26 +344,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
+ # Cannot use the common compile warning flags since the C files are created
+ # by the utilities above and they are not necessarily ANSI C, etc.
+ #
++HARDENING_FLAGS = -fPIC -pie
+ $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/prparserparse.o :    $(OBJDIR)/prparserparse.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<