Revert my last change since it has not been approved.

18 files changed, 52 insertions, 199 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c37f13e..5c02856 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,19 @@
 2008-07-12  Jie Zhang  <jie.zhang@analog.com>
 
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* elf.c (_bfd_elf_map_sections_to_segments): Don't put
+	executable sections into the same segment with other
+	read only sections if --sep-code.
+	* elf32-bfin.c (elf32_bfin_code_in_l1): New variable.
+	(elf32_bfin_data_in_l1): New variable.
+	(elf32_bfin_final_write_processing): New.
+	(elf32_bfin_special_sections[]): New.
+	(elf_backend_final_write_processing): Define.
+	(elf_backend_special_sections): Define.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
 	* elf.c (_bfd_elf_map_sections_to_segments): Don't put
 	executable sections into the same segment with other
 	read only sections if --sep-code.
diff --git a/bfd/elf.c b/bfd/elf.c
index f066c7c..d65c78d 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -3605,7 +3605,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
       asection **hdrpp;
       bfd_boolean phdr_in_segment = TRUE;
       bfd_boolean writable;
-      bfd_boolean executable;
       int tls_count = 0;
       asection *first_tls = NULL;
       asection *dynsec, *eh_frame_hdr;
@@ -3677,7 +3676,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
       phdr_index = 0;
       maxpagesize = bed->maxpagesize;
       writable = FALSE;
-      executable = FALSE;
       dynsec = bfd_get_section_by_name (abfd, ".dynamic");
       if (dynsec != NULL
 	  && (dynsec->flags & SEC_LOAD) == 0)
@@ -3759,14 +3757,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
 		 ends precisely on a page boundary.  */
 	      new_segment = TRUE;
 	    }
-	  else if (info->sep_code
-		   && ((! executable && (hdr->flags & SEC_CODE) != 0)
-		       || (executable && (hdr->flags & SEC_CODE) == 0)))
-	    {
-	      /* We don't want to put a executable section in a non-executable
-		 segment.  */
-	      new_segment = TRUE;
-	    }
 	  else
 	    {
 	      /* Otherwise, we can use the same segment.  */
@@ -3781,8 +3771,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
 	    {
 	      if ((hdr->flags & SEC_READONLY) == 0)
 		writable = TRUE;
-	      if ((hdr->flags & SEC_CODE) != 0)
-		executable = TRUE;
 	      last_hdr = hdr;
 	      /* .tbss sections effectively have zero size.  */
 	      if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD))
@@ -3808,11 +3796,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
 	  else
 	    writable = FALSE;
 
-	  if ((hdr->flags & SEC_CODE) != 0)
-	    executable = TRUE;
-	  else
-	    executable = FALSE;
-
 	  last_hdr = hdr;
 	  /* .tbss sections effectively have zero size.  */
 	  if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD)) != SEC_THREAD_LOCAL)
diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index 480feb2..f83abd2 100644
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -1119,22 +1119,6 @@ bfin_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
   return (reloc_howto_type *) NULL;
 }
 
-/* Set by ld emulation if --code-in-l1.  */
-bfd_boolean elf32_bfin_code_in_l1 = 0;
-
-/* Set by ld emulation if --data-in-l1.  */
-bfd_boolean elf32_bfin_data_in_l1 = 0;
-
-static void
-elf32_bfin_final_write_processing (bfd *abfd,
-				   bfd_boolean linker ATTRIBUTE_UNUSED)
-{
-  if (elf32_bfin_code_in_l1)
-    elf_elfheader (abfd)->e_flags |= EF_BFIN_CODE_IN_L1;
-  if (elf32_bfin_data_in_l1)
-    elf_elfheader (abfd)->e_flags |= EF_BFIN_DATA_IN_L1;
-}
-
 /* Return TRUE if the name is a local label.
    bfin local labels begin with L$.  */
 static bfd_boolean
@@ -5588,14 +5572,6 @@ error_return:
     free (internal_relocs);
   return FALSE;
 }
-
-struct bfd_elf_special_section const elf32_bfin_special_sections[] =
-{
-  { ".l1.text",		8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
-  { ".l1.data",		8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
-  { NULL,		0,  0, 0,            0 }
-};
-
 
 #define TARGET_LITTLE_SYM		bfd_elf32_bfin_vec
 #define TARGET_LITTLE_NAME		"elf32-bfin"
@@ -5642,11 +5618,8 @@ struct bfd_elf_special_section const elf32_bfin_special_sections[] =
                                         elf32_bfin_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data \
                                         elf32_bfin_print_private_bfd_data
-#define elf_backend_final_write_processing \
-					elf32_bfin_final_write_processing
 #define elf_backend_reloc_type_class    elf32_bfin_reloc_type_class
 #define elf_backend_can_gc_sections 1
-#define elf_backend_special_sections	elf32_bfin_special_sections
 #define elf_backend_can_refcount 1
 #define elf_backend_want_got_plt 0
 #define elf_backend_plt_readonly 1
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e0f1d8c..d0f96bf 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-12  Jie Zhang  <jie.zhang@analog.com>
 
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* readelf.c (get_machine_flags): Deal with Blackfin specific
+	flags.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
 	* readelf.c (get_machine_flags): Deal with Blackfin specific
 	flags.
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 789287f..8a38db7 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2140,21 +2140,6 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
 	  decode_ARM_machine_flags (e_flags, buf);
 	  break;
 
-	case EM_BLACKFIN:
-	  if (e_flags & EF_BFIN_PIC)
-	    strcat (buf, ", PIC");
-
-	  if (e_flags & EF_BFIN_FDPIC)
-	    strcat (buf, ", FDPIC");
-
-	  if (e_flags & EF_BFIN_CODE_IN_L1)
-	    strcat (buf, ", code in L1");
-
-	  if (e_flags & EF_BFIN_DATA_IN_L1)
-	    strcat (buf, ", data in L1");
-
-	  break;
-
 	case EM_CYGNUS_FRV:
 	  switch (e_flags & EF_FRV_CPU_MASK)
 	    {
diff --git a/include/ChangeLog b/include/ChangeLog
index 1cc6fc5..bf5901f 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,5 +1,14 @@
 2008-07-12  Jie Zhang  <jie.zhang@analog.com>
 
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* bfdlink.h (struct bfd_link_info): Add sep_code member
+	variable.
+	* elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.
+	(EF_BFIN_DATA_IN_L1): Define.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
 	* bfdlink.h (struct bfd_link_info): Add sep_code member
 	variable.
 	* elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.
diff --git a/include/bfdlink.h b/include/bfdlink.h
index d22519a..e683310 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -346,9 +346,6 @@ struct bfd_link_info
   /* Non-NULL if .note.gnu.build-id section should be created.  */
   char *emit_note_gnu_build_id;
 
-  /* TRUE if putting code into separate segment.  */
-  unsigned int sep_code: 1;
-
   /* What to do with unresolved symbols in an object file.
      When producing executables the default is GENERATE_ERROR.
      When producing shared libraries the default is IGNORE.  The
diff --git a/include/elf/bfin.h b/include/elf/bfin.h
index 523db9b..3c07cd1 100644
--- a/include/elf/bfin.h
+++ b/include/elf/bfin.h
@@ -88,8 +88,5 @@ END_RELOC_NUMBERS (R_max)
 #define EF_BFIN_PIC		0x00000001	/* -fpic */
 #define EF_BFIN_FDPIC		0x00000002      /* -mfdpic */
 
-#define EF_BFIN_CODE_IN_L1	0x00000010	/* --code-in-l1 */
-#define EF_BFIN_DATA_IN_L1	0x00000020	/* --data-in-l1 */
-
 #define	EF_BFIN_PIC_FLAGS	(EF_BFIN_PIC | EF_BFIN_FDPIC)
 #endif /* _ELF_BFIN_H */
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 91bae67..02bcfd0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,23 @@
 2008-07-12  Jie Zhang  <jie.zhang@analog.com>
 
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* Makefile.am (eelf32bfin.c): Depend on bfin.em.
+	(eelf32bfinfd.c): Likewise.
+	* Makefile.in: Regenerate.
+	* gen-doc.texi: Set Blackfin.
+	* ld.texinfo: Document --sep-code and Blackfin specific
+	options.
+	* ldmain.c (main): Initialize link_info.sep_code.
+	* lexsup.c (enum option_values): Add OPTION_SEP_CODE.
+	(ld_options[]): Add --sep-code.
+	(parse_args): Deal with --sep-code.
+	* emulparams/bfin.sh (EXTRA_EM_FILE): Define.
+	* emulparams/elf32bfinfd.sh (OTHER_SECTIONS): Define.
+	* emultempl/bfin.em: New file.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
 	* Makefile.am (eelf32bfin.c): Depend on bfin.em.
 	(eelf32bfinfd.c): Likewise.
 	* Makefile.in: Regenerate.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index fe8edf0..80c53d8 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -653,11 +653,11 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} delta68 "$(tdir_delta68)"
 eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
-  $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
+  $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin
 eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh $(srcdir)/emulparams/bfin.sh \
-  $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
+  $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd
 eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 06b4846..94e5d68 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1482,11 +1482,11 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} delta68 "$(tdir_delta68)"
 eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
-  $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
+  $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32bfin "$(tdir_elf32bfin)" bfin
 eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh $(srcdir)/emulparams/bfin.sh \
-  $(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
+  $(ELF_DEPS) \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32bfinfd "$(tdir_elf32bfinfd)" elf32bfinfd
 eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \
diff --git a/ld/emulparams/bfin.sh b/ld/emulparams/bfin.sh
index f33baf5..1c764e8 100755
--- a/ld/emulparams/bfin.sh
+++ b/ld/emulparams/bfin.sh
@@ -10,4 +10,3 @@ TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 EMBEDDED=yes
 USER_LABEL_PREFIX=_
-EXTRA_EM_FILE=bfin
diff --git a/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh
index 588a53f..19ec748 100644
--- a/ld/emulparams/elf32bfinfd.sh
+++ b/ld/emulparams/elf32bfinfd.sh
@@ -14,24 +14,3 @@ OTHER_READONLY_SECTIONS="
     ${RELOCATING+__ROFIXUP_END__ = .;}
   }
 "
-# 0xff700000, 0xff800000, 0xff900000 and 0xffa00000 are also used in
-# Dynamic linker and linux kernel. They need to be keep synchronized.
-OTHER_SECTIONS="
-  .l1.data 0xff700000	:
-  {
-    *(.l1.data)
-  }
-  .l1.data.A 0xff800000	:
-  {
-    *(.l1.data.A)
-  }
-  .l1.data.B 0xff900000	:
-  {
-    *(.l1.data.B)
-  }
-  .l1.text  0xffa00000	:
-  {
-    *(.l1.text)
-  }
-"
-EXTRA_EM_FILE=bfin
diff --git a/ld/emultempl/bfin.em b/ld/emultempl/bfin.em
deleted file mode 100644
index 326537d..0000000
--- a/ld/emultempl/bfin.em
+++ /dev/null
@@ -1,64 +0,0 @@
-# This shell script emits a C file. -*- C -*-
-#   Copyright 2006 Free Software Foundation, Inc.
-#
-# This file is part of GLD, the Gnu Linker.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-# This file is sourced from elf32.em, and defines extra bfin-elf
-# specific routines.
-#
-cat >>e${EMULATION_NAME}.c <<EOF
-
-#include "elf-bfd.h"
-
-/* Whether to put code in Blackfin L1 SRAM.  */
-extern bfd_boolean elf32_bfin_code_in_l1;
-
-/* Whether to put (writable) data in Blackfin L1 SRAM.  */
-extern bfd_boolean elf32_bfin_data_in_l1;
-
-EOF
-
-
-# Define some shell vars to insert bits of code into the standard elf
-# parse_args and list_options functions.
-#
-PARSE_AND_LIST_PROLOGUE='
-#define OPTION_CODE_IN_L1		300
-#define OPTION_DATA_IN_L1		301
-'
-
-PARSE_AND_LIST_LONGOPTS='
-  { "code-in-l1", no_argument, NULL, OPTION_CODE_IN_L1 },
-  { "data-in-l1", no_argument, NULL, OPTION_DATA_IN_L1 },
-'
-
-PARSE_AND_LIST_OPTIONS='
-  fprintf (file, _("\
-  --code-in-l1          Put code in l1.\n\
-  --data-in-l1          Put data in l1.\n"
-		   ));
-'
-
-PARSE_AND_LIST_ARGS_CASES='
-    case OPTION_CODE_IN_L1:
-      elf32_bfin_code_in_l1 = TRUE;
-      break;
-    case OPTION_DATA_IN_L1:
-      elf32_bfin_data_in_l1 = TRUE;
-      break;
-'
diff --git a/ld/gen-doc.texi b/ld/gen-doc.texi
index f7e75cf..7434edb 100644
--- a/ld/gen-doc.texi
+++ b/ld/gen-doc.texi
@@ -4,7 +4,6 @@
 
 @c 2. Specific target machines
 @set ARM
-@set Blackfin
 @set H8300
 @set HPPA
 @set I960
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index a37d7d5..4400524 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -21,7 +21,6 @@
 @set UsesEnvVars
 @set GENERIC
 @set ARM
-@set Blackfin
 @set H8300
 @set HPPA
 @set I960
@@ -141,9 +140,6 @@ section entitled ``GNU Free Documentation License''.
 @ifset ARM
 * ARM::				ld and the ARM family
 @end ifset
-@ifset Blackfin
-* Blackfin::			ld and the Blackfin family
-@end ifset
 @ifset HPPA
 * HPPA ELF32::                  ld and HPPA 32-bit ELF
 @end ifset
@@ -829,11 +825,6 @@ For compatibility with other ELF linkers, if the @option{-R} option is
 followed by a directory name, rather than a file name, it is treated as
 the @option{-rpath} option.
 
-@kindex --sep-code
-@cindex input files, displaying
-@itemx --sep-code
-Put code in a seperate segment, not along with other read only data.
-
 @kindex -s
 @kindex --strip-all
 @cindex strip all symbols
@@ -5371,9 +5362,6 @@ functionality are not listed.
 @ifset ARM
 * ARM::				@command{ld} and the ARM family
 @end ifset
-@ifset Blackfin
-* Blackfin::			@command{ld} and the Blackfin family
-@end ifset
 @ifset HPPA
 * HPPA ELF32::                  @command{ld} and HPPA 32-bit ELF
 @end ifset
@@ -5764,30 +5752,6 @@ otherwise.
 @end ifclear
 @end ifset
 
-@ifset Blackfin
-@ifclear GENERIC
-@raisesections
-@end ifclear
-
-@node Blackfin
-@section @command{ld} and the Blackfin family
-
-@cindex Put code in L1 instruction SRAM
-@kindex --code-in-l1
-The @samp{--code-in-l1} option adds a specific flag in the ELF header.
-This flag tells loader to put the code segments into Blackfin
-L1 instruction SRAM.
-
-@cindex Put code in L1 data SRAM
-@kindex --data-in-l1
-The @samp{--data-in-l1} option adds a specific flag in the ELF header.
-This flag tells loader to put the data segments into Blackfin L1 data SRAM.
-
-@ifclear GENERIC
-@lowersections
-@end ifclear
-@end ifset
-
 @ifset HPPA
 @ifclear GENERIC
 @raisesections
diff --git a/ld/ldmain.c b/ld/ldmain.c
index d094afa..e7b9c0f 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -277,7 +277,6 @@ main (int argc, char **argv)
   link_info.pei386_auto_import = -1;
   link_info.spare_dynamic_tags = 5;
   link_info.path_separator = ':';
-  link_info.sep_code = FALSE;
 
   ldfile_add_arch ("");
   emulation = get_emulation (argc, argv);
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 3f63060..60a8167 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -92,7 +92,6 @@ enum option_values
   OPTION_RETAIN_SYMBOLS_FILE,
   OPTION_RPATH,
   OPTION_RPATH_LINK,
-  OPTION_SEP_CODE,
   OPTION_SHARED,
   OPTION_SONAME,
   OPTION_SORT_COMMON,
@@ -478,8 +477,6 @@ static const struct ld_option ld_options[] =
     '\0', NULL, N_("Create a position independent executable"), ONE_DASH },
   { {"pic-executable", no_argument, NULL, OPTION_PIE},
     '\0', NULL, NULL, TWO_DASHES },
-  { {"sep-code", no_argument, NULL, OPTION_SEP_CODE},
-    '\0', NULL, N_("Put code into separate segment"), TWO_DASHES },
   { {"sort-common", optional_argument, NULL, OPTION_SORT_COMMON},
     '\0', N_("[=ascending|descending]"), 
     N_("Sort common symbols by alignment [in specified order]"), 
@@ -1146,9 +1143,6 @@ parse_args (unsigned argc, char **argv)
 	  else
 	    einfo (_("%P%F: -pie not supported\n"));
 	  break;
-	case OPTION_SEP_CODE:
-	  link_info.sep_code = TRUE;
-	  break;
 	case 'h':		/* Used on Solaris.  */
 	case OPTION_SONAME:
 	  command_line.soname = optarg;