--- gcc/config/i386/gas.h	2018/04/24 18:17:10	1.1.1.2
+++ gcc/config/i386/gas.h	2018/04/24 18:31:03	1.1.1.3
@@ -15,7 +15,8 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Note that i386/seq-gas.h is a GAS configuration that does not use this
    file. */
@@ -82,15 +83,15 @@ the Free Software Foundation, 675 Mass A
    For the 486, align to 16-byte boundary for sake of cache.  */
 
 #undef ASM_OUTPUT_ALIGN_CODE
-#define ASM_OUTPUT_ALIGN_CODE(FILE)			\
-     fprintf ((FILE), "\t.align %d,0x90\n",		\
-	      TARGET_486 ? 4 : 2);  /* Use log of 16 or log of 4 as arg.  */
+#define ASM_OUTPUT_ALIGN_CODE(FILE) \
+  fprintf ((FILE), "\t.align %d,0x90\n", i386_align_jumps)
 
 /* Align start of loop at 4-byte boundary.  */
 
 #undef ASM_OUTPUT_LOOP_ALIGN
 #define ASM_OUTPUT_LOOP_ALIGN(FILE) \
-     fprintf ((FILE), "\t.align 2,0x90\n");  /* Use log of 4 as arg.  */
+  fprintf ((FILE), "\t.align %d,0x90\n", i386_align_loops)
+
 
 /* A C statement or statements which output an assembler instruction
    opcode to the stdio stream STREAM.  The macro-operand PTR is a