Message ID | 20230212172540.2898451-1-raj.khem@gmail.com |
---|---|
State | New |
Headers | show |
Series | optee-os: Forward port 0008-no-warn-rwx-segments.patch to 3.19.0 | expand |
ignore this patch. On Sun, Feb 12, 2023 at 9:25 AM Khem Raj <raj.khem@gmail.com> wrote: > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../0008-no-warn-rwx-segments.patch | 26 +++++++++---------- > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch b/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch > index 2dc797b3..5a9bad6d 100644 > --- a/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch > +++ b/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch > @@ -1,38 +1,36 @@ > -diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk > -index 0e96e606c..3fbcb6804 100644 > --- a/core/arch/arm/kernel/link.mk > +++ b/core/arch/arm/kernel/link.mk > -@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment > +@@ -25,6 +25,7 @@ link-ldflags += -T $(link-script-pp) -Ma > + link-ldflags += --sort-section=alignment > link-ldflags += --fatal-warnings > link-ldflags += --gc-sections > - link-ldflags += $(link-ldflags-common) > +link-ldflags += $(call ld-option,--no-warn-rwx-segments) > > link-ldadd = $(LDADD) > link-ldadd += $(ldflags-external) > -@@ -61,6 +62,7 @@ link-script-cppflags := \ > +@@ -49,6 +50,7 @@ link-script-cppflags := \ > $(cppflagscore)) > > ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \ > + $(call ld-option,--no-warn-rwx-segments) \ > - $(link-ldflags-common) \ > $(link-objs) $(link-ldadd) $(libgcccore) > cleanfiles += $(link-out-dir)/all_objs.o > -@@ -75,7 +77,7 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o > + $(link-out-dir)/all_objs.o: $(objs) $(libdeps) $(MAKEFILE_LIST) > +@@ -61,7 +63,7 @@ $(link-out-dir)/unpaged_entries.txt: $(l > + $(q)$(NMcore) $< | \ > $(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@ > > - unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ > -- $(link-ldflags-common) > -+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments) > +-unpaged-ldargs = -T $(link-script-dummy) --no-check-sections --gc-sections > ++unpaged-ldargs = -T $(link-script-dummy) --no-check-sections --gc-sections $(call ld-option,--no-warn-rwx-segments) > unpaged-ldadd := $(objs) $(link-ldadd) $(libgcccore) > cleanfiles += $(link-out-dir)/unpaged.o > $(link-out-dir)/unpaged.o: $(link-out-dir)/unpaged_entries.txt > -@@ -104,7 +106,7 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o > +@@ -89,7 +91,7 @@ $(link-out-dir)/init_entries.txt: $(link > + $(q)$(NMcore) $< | \ > $(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@ > > - init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ > -- $(link-ldflags-common) > -+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments) > +-init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections > ++init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections $(call ld-option,--no-warn-rwx-segments) > init-ldadd := $(link-objs-init) $(link-out-dir)/version.o $(link-ldadd) \ > $(libgcccore) > cleanfiles += $(link-out-dir)/init.o > -- > 2.39.1 >
diff --git a/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch b/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch index 2dc797b3..5a9bad6d 100644 --- a/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch +++ b/meta-arm/recipes-security/optee/optee-os-3.19.0/0008-no-warn-rwx-segments.patch @@ -1,38 +1,36 @@ -diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk -index 0e96e606c..3fbcb6804 100644 --- a/core/arch/arm/kernel/link.mk +++ b/core/arch/arm/kernel/link.mk -@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment +@@ -25,6 +25,7 @@ link-ldflags += -T $(link-script-pp) -Ma + link-ldflags += --sort-section=alignment link-ldflags += --fatal-warnings link-ldflags += --gc-sections - link-ldflags += $(link-ldflags-common) +link-ldflags += $(call ld-option,--no-warn-rwx-segments) link-ldadd = $(LDADD) link-ldadd += $(ldflags-external) -@@ -61,6 +62,7 @@ link-script-cppflags := \ +@@ -49,6 +50,7 @@ link-script-cppflags := \ $(cppflagscore)) ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \ + $(call ld-option,--no-warn-rwx-segments) \ - $(link-ldflags-common) \ $(link-objs) $(link-ldadd) $(libgcccore) cleanfiles += $(link-out-dir)/all_objs.o -@@ -75,7 +77,7 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o + $(link-out-dir)/all_objs.o: $(objs) $(libdeps) $(MAKEFILE_LIST) +@@ -61,7 +63,7 @@ $(link-out-dir)/unpaged_entries.txt: $(l + $(q)$(NMcore) $< | \ $(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@ - unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ -- $(link-ldflags-common) -+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments) +-unpaged-ldargs = -T $(link-script-dummy) --no-check-sections --gc-sections ++unpaged-ldargs = -T $(link-script-dummy) --no-check-sections --gc-sections $(call ld-option,--no-warn-rwx-segments) unpaged-ldadd := $(objs) $(link-ldadd) $(libgcccore) cleanfiles += $(link-out-dir)/unpaged.o $(link-out-dir)/unpaged.o: $(link-out-dir)/unpaged_entries.txt -@@ -104,7 +106,7 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o +@@ -89,7 +91,7 @@ $(link-out-dir)/init_entries.txt: $(link + $(q)$(NMcore) $< | \ $(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@ - init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ -- $(link-ldflags-common) -+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments) +-init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections ++init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections $(call ld-option,--no-warn-rwx-segments) init-ldadd := $(link-objs-init) $(link-out-dir)/version.o $(link-ldadd) \ $(libgcccore) cleanfiles += $(link-out-dir)/init.o
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../0008-no-warn-rwx-segments.patch | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-)