Author: emaste
Date: Wed Dec 28 23:02:01 2016
New Revision: 310726
URL: https://svnweb.freebsd.org/changeset/base/310726

Log:
  cdboot: add explict suffix to ambiguous or instruction
  
  Clang disallows ambiguous instructions (GNU as has a default based on
  chosen .code setting). We only need 'orb' here because KARGS_FLAGS_PXE
  fits in a byte; this is the same as done in bxeboot.
  
  Reviewed by:  kib
  Sponsored by: The FreeBSD Foundation
  Differential Revision:        https://reviews.freebsd.org/D8959

Modified:
  head/sys/boot/i386/cdboot/cdboot.S

Modified: head/sys/boot/i386/cdboot/cdboot.S
==============================================================================
--- head/sys/boot/i386/cdboot/cdboot.S  Wed Dec 28 21:58:20 2016        
(r310725)
+++ head/sys/boot/i386/cdboot/cdboot.S  Wed Dec 28 23:02:01 2016        
(r310726)
@@ -127,7 +127,7 @@ start:              cld                             # 
string ops inc
                stosl                           #  to zero
                mov drive,%dl                   # Store BIOS boot device
                mov %dl,0x4(%bx)                #  in kargs->bootdev
-               or $KARGS_FLAGS_CD,0x8(%bx)     # kargs->bootflags |=
+               orb $KARGS_FLAGS_CD,0x8(%bx)    # kargs->bootflags |=
                                                #  KARGS_FLAGS_CD
 #
 # Load Volume Descriptor
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to