diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 292ec0a7fd..caa5483c48 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* bfd/elf32-tic6x.c (elf32_tic6x_set_osabi): Also set it if
+	link_info is NULL.
+
 2011-06-28  Tristan Gingold  <gingold@adacore.com>
 
 	* vms-alpha.c (vms_private_data_struct): Make vms_linkage_index
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 4e9d202138..19287fec18 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -4473,7 +4473,7 @@ elf32_tic6x_write_section (bfd *output_bfd,
 static void
 elf32_tic6x_set_osabi (bfd *abfd, struct bfd_link_info *link_info)
 {
-  if (link_info == NULL || link_info->relocatable)
+  if (link_info != NULL && link_info->relocatable)
     return;
   _bfd_elf_set_osabi (abfd, link_info);
 }