6cfdaac
#
6cfdaac
# Red Hat BZ:
6cfdaac
# https://bugzilla.redhat.com/show_bug.cgi?id=911307
6cfdaac
#
6cfdaac
# Sourceware BZ: None.
6cfdaac
#
6cfdaac
# Upstreamm submission: Not yet completed.
6cfdaac
#
6cfdaac
# ChangeLog
6cfdaac
#
6cfdaac
# 2013-02-27  Carlos O'Donell  <carlos@redhat.com>
6cfdaac
#
6cfdaac
#	* elf/Makefile (CFLAGS-.o): Add -fno-tree-loop-distribute-patterns.
6cfdaac
#	(CFLAGS-.os): Likewise.
6cfdaac
#	(CFLAGS-.op): Likewise.
6cfdaac
#	(CFLAGS-.ob): Likewise.
6cfdaac
#	(CFLAGS-.oS): Likewise.
6cfdaac
#	* string/Makefile (CFLAGS-.o): Likewise.
6cfdaac
#	(CFLAGS-.os): Likewise.
6cfdaac
#	(CFLAGS-.op): Likewise.
6cfdaac
#	(CFLAGS-.ob): Likewise.
6cfdaac
#	(CFLAGS-.oS): Likewise.
6cfdaac
#
6cfdaac
diff -urN glibc-2.17-c758a686/string/Makefile tmp/glibc-2.17-c758a686/string/Makefile
6cfdaac
--- glibc-2.17-c758a686/string/Makefile	2013-02-27 18:07:34.618968703 -0500
6cfdaac
+++ tmp/glibc-2.17-c758a686/string/Makefile	2013-02-27 18:08:16.075796160 -0500
Siddhesh Poyarekar 3cd9b9c
@@ -72,6 +72,14 @@ CFLAGS-stratcliff.c = -fno-builtin
Siddhesh Poyarekar 3cd9b9c
 CFLAGS-test-ffs.c = -fno-builtin
Siddhesh Poyarekar 3cd9b9c
 CFLAGS-tst-inlcall.c = -fno-builtin
6cfdaac
 
6cfdaac
+# Disable any optimization which might result in function calls to the very
6cfdaac
+# same functions we are trying to compile, thus creating an infinite loop.
6cfdaac
+CFLAGS-.o += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.os += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.op += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.ob += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.oS += -fno-tree-loop-distribute-patterns
6cfdaac
+
6cfdaac
 ifeq ($(run-built-tests),yes)
Siddhesh Poyarekar 372014c
 tests: $(objpfx)tst-svc-cmp.out
Siddhesh Poyarekar 372014c
 $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
6cfdaac
diff -urN glibc-2.17-c758a686/elf/Makefile tmp/glibc-2.17-c758a686/elf/Makefile
6cfdaac
--- glibc-2.17-c758a686/elf/Makefile	2013-02-27 18:07:13.812055613 -0500
6cfdaac
+++ tmp/glibc-2.17-c758a686/elf/Makefile	2013-02-27 18:08:16.075796160 -0500
6cfdaac
@@ -432,6 +432,16 @@
6cfdaac
 CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
6cfdaac
 		     -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
6cfdaac
 
6cfdaac
+# Disable any optimization which might result in function calls during early
6cfdaac
+# dynamic loader startup. We disable -ftree-loop-distribute-patterns which
6cfdaac
+# might convert code into calls to functions like memcpy or memset when the PLT
6cfdaac
+# is not yet setup.
6cfdaac
+CFLAGS-.o += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.os += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.op += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.ob += -fno-tree-loop-distribute-patterns
6cfdaac
+CFLAGS-.oS += -fno-tree-loop-distribute-patterns
6cfdaac
+
6cfdaac
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
6cfdaac
 generated += $(addsuffix .so,$(strip $(modules-names)))
Siddhesh Poyarekar 3cd9b9c