diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2011-03-05 04:31:41 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2011-03-05 04:31:41 +0000 |
| commit | 61ff971fde0091b61ae9c512750638bf0bfcb1be (patch) | |
| tree | bdce774c69affae4678c290f6f4c2531937bfaf9 /gas | |
| parent | 64794aa4b43e3ceb472c62fb1a2e70a71ba9e256 (diff) | |
| download | binutils-61ff971fde0091b61ae9c512750638bf0bfcb1be.tar.gz binutils-61ff971fde0091b61ae9c512750638bf0bfcb1be.tar.bz2 binutils-61ff971fde0091b61ae9c512750638bf0bfcb1be.zip | |
Revert the last change.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/config/tc-i386.c | 13 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d | 6 |
4 files changed, 6 insertions, 26 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 7688f52afad..f53dd03ff2e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,12 +1,3 @@ -2011-03-04 H.J. Lu <hongjiu.lu@intel.com> - - * config/tc-i386.c (x86_cie_stack_alignment): New. - (md_begin): Set x86_cie_data_alignment if it isn't set. Set - x86_cie_stack_alignment. - (i386_target_format): Set x86_cie_data_alignment to -4 for x32. - (tc_x86_frame_initial_instructions): Use x86_cie_stack_alignment - instead of x86_cie_data_alignment on SP and RA. - 2011-03-02 Nick Clifton <nickc@redhat.com> * ecoff.c: Incldue filenames.h diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index d278172feac..5cc82190a8c 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -502,9 +502,6 @@ unsigned int x86_dwarf2_return_column; /* The dwarf2 data alignment, adjusted for 32 or 64 bit. */ int x86_cie_data_alignment; -/* The dwarf2 stack alignment, adjusted for 32 or 64 bit. */ -static int x86_cie_stack_alignment; - /* Interface to relax_segment. There are 3 major relax states for 386 jump insns because the different types of jumps add different sizes to frags when we're @@ -2381,15 +2378,12 @@ md_begin () #else x86_dwarf2_return_column = 16; #endif - if (!x86_cie_data_alignment) - x86_cie_data_alignment = -8; - x86_cie_stack_alignment = -8; + x86_cie_data_alignment = -8; } else { x86_dwarf2_return_column = 8; x86_cie_data_alignment = -4; - x86_cie_stack_alignment = -4; } } @@ -8642,7 +8636,6 @@ i386_target_format (void) use_rela_relocations = 1; object_64bit = 1; disallow_64bit_reloc = 1; - x86_cie_data_alignment = -4; format = ELF_TARGET_FORMAT32; break; } @@ -9052,8 +9045,8 @@ tc_x86_frame_initial_instructions (void) input_line_pointer = saved_input; } - cfi_add_CFA_def_cfa (sp_regno[flag_code >> 1], -x86_cie_stack_alignment); - cfi_add_CFA_offset (x86_dwarf2_return_column, x86_cie_stack_alignment); + cfi_add_CFA_def_cfa (sp_regno[flag_code >> 1], -x86_cie_data_alignment); + cfi_add_CFA_offset (x86_dwarf2_return_column, x86_cie_data_alignment); } int diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 56b8823a196..c4fbd0a2e10 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,7 +1,3 @@ -2011-03-04 H.J. Lu <hongjiu.lu@intel.com> - - * gas/i386/ilp32/cfi/cfi-x86_64.d: Updated. - 2011-02-28 Maciej W. Rozycki <macro@codesourcery.com> * gas/mips/alnv_ps-swap.d: New test for ALNV.PS instruction diff --git a/gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d b/gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d index 27dd2f5b705..f1aa45e7e0c 100644 --- a/gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d +++ b/gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d @@ -7,7 +7,7 @@ Contents of the .eh_frame section: Version: 1 Augmentation: "zR" Code alignment factor: 1 - Data alignment factor: -4 + Data alignment factor: -8 Return address column: 16 Augmentation data: 1b @@ -55,7 +55,7 @@ Contents of the .eh_frame section: Version: 1 Augmentation: "zR" Code alignment factor: 1 - Data alignment factor: -4 + Data alignment factor: -8 Return address column: 16 Augmentation data: 1b @@ -88,7 +88,7 @@ Contents of the .eh_frame section: Version: 1 Augmentation: "zR" Code alignment factor: 1 - Data alignment factor: -4 + Data alignment factor: -8 Return address column: 16 Augmentation data: 1b |