am33 sanitization changes

4 files changed, 23 insertions, 41 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 73213d4..f87a333 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -317,34 +317,6 @@ for i in $never_files ; do
 	fi
 done
 
-am33_files="ChangeLog archures.c bfd-in2.h cpu-m10300.c elf-m10300.c"
-if ( echo $* | grep keep\-am33 > /dev/null ) ; then
-	for i in $am33_files ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping am33 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $am33_files ; do
-		if test ! -d $i && (grep sanitize-am33 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"am33\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-am33/,/end-\sanitize\-am33/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				if [ -n "${verbose}" ] ; then
-					echo Caching $i in .Recover...
-				fi
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 v850_files="ChangeLog ChangeLog-9697 Makefile.in Makefile.am archures.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h elf.c libbfd.h elf32-v850.c cpu-v850.c"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850_files ; do
@@ -485,7 +457,7 @@ else
 	done
 fi
 
-cygnus_files="ChangeLog ChangeLog-9697 archures.c bfd-in2.h bfd-in.h cpu-mips.c elf32-mips.c"
+cygnus_files="ChangeLog ChangeLog-9697 archures.c bfd-in2.h bfd-in.h cpu-mips.c elf32-mips.c cpu-m10300.c elf-m10300.c"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	for i in $cygnus_files ; do
 		if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a26094c..a046a2f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 18 03:35:35 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): If not D_PAGED,
+	align first section to largest section alignment, not first
+	section alignment.
+
 1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)
 
 	* configure.in: Require autoconf 2.12.1 or higher.
@@ -979,20 +985,20 @@ Fri Jul 24 13:54:19 1998  Nick Clifton  <nickc@cygnus.com>
 
 Fri Jul 24 11:24:29 1998  Jeffrey A Law  (law@cygnus.com)
 
-start-sanitize-am33
+start-sanitize-cygnus
 	* elf-m10300.c (mn10300_elf_relax_section): Fix typo when relaxing
 	from 24bit operand to an 8bit operand.
 
 	* elf-m10300.c (mn10300_elf_relax_section): Do not relax "dmul",
 	"dmulu", "dmach", "dmachu" with 32bit operands.
-end-sanitize-am33
+end-sanitize-cygnus
 
 	* elf-m10300.c (mn10300_elf_howto): Add R_MN10300_24 entry.
 	(mn10300_elf_reloc_map): Similarly.
 	(mn10300_elf_final_link_relocate): Handle R_MN10300_24.
-start-sanitize-am33
+start-sanitize-cygnus
 	(mn10300_elf_relax_section): Support relaxing on the am33.
-end-sanitize-am33
+end-sanitize-cygnus
 
 Fri Jul 24 12:36:04 1998  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -1024,10 +1030,10 @@ Thu Jul 23 13:33:19 1998  Doug Evans  <devans@canuck.cygnus.com>
 
 Thu Jul 23 11:29:43 1998  Jeffrey A Law  (law@cygnus.com)
 
-start-sanitize-am33
+start-sanitize-cygnus
 	* elf-m10300.c (compute_function_info): Keep track of stack space
 	needed by am33 movm instruction variant.
-end-sanitize-am33
+end-sanitize-cygnus
 
 	* Re-add lost change:
         * elf-m10300.c (elf32_mn10300_link_hash_entry): Add new field
@@ -1377,11 +1383,11 @@ Fri Jun 26 10:48:23 1998  Jeffrey A Law  (law@cygnus.com)
 	(_bfd_mn10300_elf_object_p): Likewise.
 	(elf_backendfinal_write_processing): Define.
 	(elf_backend_object_p): Likewise.
-start-sanitize-am33
+start-sanitize-cygnus
 	* archures.c (bfd_mach_am33): Define.
 	* cpu-m10300.c (bfd_am33_arch): New arch info structure.  Link it
 	into the NEXT field of bfd_mn10300_arch.
-end-sanitize-am33
+end-sanitize-cygnus
 
 Thu Jun 25 18:31:08 1998  Nick Clifton  <nickc@cygnus.com>
 
diff --git a/bfd/archures.c b/bfd/archures.c
index 179f8d8..f62f9a7 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -121,6 +121,7 @@ DESCRIPTION
 .#define bfd_mach_mips4010		4010
 .#define bfd_mach_mips4100		4100
 . {* start-sanitize-vr4xxx *}
+.#define bfd_mach_mips4111		4111
 .#define bfd_mach_mips4121		4121
 . {* end-sanitize-vr4xxx *}
 .#define bfd_mach_mips4300		4300
@@ -155,6 +156,7 @@ DESCRIPTION
 .  bfd_arch_i386,      {* Intel 386 *}
 .#define bfd_mach_i386_i386 0
 .#define bfd_mach_i386_i8086 1
+.#define bfd_mach_i386_i386_intel_syntax 2
 .  bfd_arch_we32k,     {* AT&T WE32xxx *}
 .  bfd_arch_tahoe,     {* CCI/Harris Tahoe *}
 .  bfd_arch_i860,      {* Intel 860 *}
@@ -214,9 +216,9 @@ DESCRIPTION
 .  bfd_arch_mn10200,   {* Matsushita MN10200 *}
 .  bfd_arch_mn10300,   {* Matsushita MN10300 *}
 .#define bfd_mach_mn10300		300
-. {* start-sanitize-am33 *}
+. {* start-sanitize-cygnus *}
 .#define bfd_mach_am33		330
-. {* end-sanitize-am33 *}
+. {* end-sanitize-cygnus *}
 .  bfd_arch_fr30,
 .#define bfd_mach_fr30		0x46523330
 .  bfd_arch_last
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 99f2d7e..44119e2 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1258,6 +1258,7 @@ enum bfd_architecture
 #define bfd_mach_mips4010              4010
 #define bfd_mach_mips4100              4100
   /* start-sanitize-vr4xxx */
+#define bfd_mach_mips4111              4111
 #define bfd_mach_mips4121              4121
   /* end-sanitize-vr4xxx */
 #define bfd_mach_mips4300              4300
@@ -1292,6 +1293,7 @@ enum bfd_architecture
   bfd_arch_i386,       /* Intel 386 */
 #define bfd_mach_i386_i386 0
 #define bfd_mach_i386_i8086 1
+#define bfd_mach_i386_i386_intel_syntax 2
   bfd_arch_we32k,      /* AT&T WE32xxx */
   bfd_arch_tahoe,      /* CCI/Harris Tahoe */
   bfd_arch_i860,       /* Intel 860 */
@@ -1351,9 +1353,9 @@ enum bfd_architecture
   bfd_arch_mn10200,    /* Matsushita MN10200 */
   bfd_arch_mn10300,    /* Matsushita MN10300 */
 #define bfd_mach_mn10300               300
-  /* start-sanitize-am33 */
+  /* start-sanitize-cygnus */
 #define bfd_mach_am33          330
-  /* end-sanitize-am33 */
+  /* end-sanitize-cygnus */
   bfd_arch_fr30,
 #define bfd_mach_fr30          0x46523330
   bfd_arch_last