gcc/ChangeLog:
--------------
2015-05-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	PR target/66215
	* config/s390/s390.c (s390_reorg): Fix placement of post-label NOPs
	with -mhotpatch=.

gcc/testsuite/ChangeLog:
------------------------
2015-05-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	PR target/66215
	* gcc.target/s390/hotpatch-1.c: Remove optimization options from
	dg-options.
	* gcc.target/s390/hotpatch-10.c: Likewise.
	* gcc.target/s390/hotpatch-11.c: Likewise.
	* gcc.target/s390/hotpatch-12.c: Likewise.
	* gcc.target/s390/hotpatch-17.c: Likewise.
	* gcc.target/s390/hotpatch-18.c: Likewise.
	* gcc.target/s390/hotpatch-20.c: Likewise.
	* gcc.target/s390/hotpatch-21.c: Likewise.
	* gcc.target/s390/hotpatch-22.c: Likewise.
	* gcc.target/s390/hotpatch-23.c: Likewise.
	* gcc.target/s390/hotpatch-24.c: Likewise.
	* gcc.target/s390/hotpatch-2.c: Likewise.  Adjust scan-assembler
	to check for the exact nops too.
	* gcc.target/s390/hotpatch-3.c: Likewise.
	* gcc.target/s390/hotpatch-4.c: Likewise.
	* gcc.target/s390/hotpatch-5.c: Likewise.
	* gcc.target/s390/hotpatch-6.c: Likewise.
	* gcc.target/s390/hotpatch-7.c: Likewise.
	* gcc.target/s390/hotpatch-8.c: Likewise.
	* gcc.target/s390/hotpatch-9.c: Likewise.
	* gcc.target/s390/hotpatch-14.c: Likewise.
	* gcc.target/s390/hotpatch-15.c: Likewise.
	* gcc.target/s390/hotpatch-16.c: Likewise.
	* gcc.target/s390/hotpatch-19.c: Likewise.
	* gcc.target/s390/hotpatch-25.c: Likewise.  Remove
	scan-assembler-times counting number of .align directives.
	* gcc.target/s390/hotpatch-13.c: Remove optimization options from
	dg-options.  Remove scan-assembler-times counting number of .align
	directives.
	* gcc.target/s390/hotpatch-26.c: New file.
	* gcc.target/s390/hotpatch-27.c: New file.
	* gcc.target/s390/hotpatch-28.c: New file.
	* gcc.target/s390/s390.exp: Run hotpatch-*.c tests as torture tests
	using -Os -O0 -O1 -O2 -O3 options.