Upstreaming changes to support Rust on Bitrig

[dhuseby]

Summary

This patch adds a few things to LLVM that were necessary to bootstrap Rust on Bitrig.

[echristo]

lib/Target/X86/X86Subtarget.h

396 ↗

(On Diff #19704)

Seems unused?

[dhuseby]

I can't figure out how to update this patch so I'm abandoning it and creating a new one.

[dhuseby]

nvrmnd, figured it out.

[dhuseby]

this removes the unused code.

[dhuseby]

Can I get some review love on this patch? This should be straight forward. Thanks!

[echristo]

Some comments:

a) Don't edit configure by hand. Edit configure.ac and regenerate.
b) Why the Makefile.config.in change?

-eric

[dhuseby]

The changes to Makefile.config.in came from a a patch in the Bitrig LLVM port. I reworked it so that it was conditional and only operative when building for Bitrig.

I'll update the patch to change configure.ac instead.

[dhuseby]

Updated the patch by modifying autoconf/configure.ac and re-running autoconf/AutoRegen.sh as per review feedback.

The changes to Makefile.config.in are to get the output paths for the documentation correct for Bitrig only when compiling for Bitrig.

[dhuseby]

Ooops, the previous diff was in the wrong direction. This one is in the correct direction.

[dhuseby]

On second thought, I removed the changes to Makefile.config.in. Bitrig can continue to patch that as part of its port. There's no need to dirty up the Makefile for a local quirk of one OS.

The rest of the patch is necessary to get llvm to properly detect building for Bitrig.

[echristo]

Thanks, I wasn't fond of the Makefile.config.in part :)

LGTM. Do you have commit access or do you need someone to do it?

-eric

[dhuseby]

I do not have commit access. I need somebody to land it for me.

Thanks!

[echristo]

Applied here:

dzur:~/sources/llvm> git svn dcommit
Committing to https://llvm.org/svn/llvm-project/llvm/trunk ...
M autoconf/config.sub
M autoconf/configure.ac
M configure
Committed r230669

Thanks!

-eric

Makefile.config.in

 LLVM_ON_WIN32:=@LLVM_ON_WIN32@
 
 # Host operating system for which LLVM will be run.
 OS=@OS@
 HOST_OS=@HOST_OS@
 # Target operating system for which LLVM will compile for.
 TARGET_OS=@TARGET_OS@
 
+# Adjust paths for Bitrig
+ifeq ($(TARGET_OS),Bitrig)
+PROJ_docsdir    := $(PROJ_prefix)/share/docs/llvm
+PROJ_mandir     := $(PROJ_prefix)/man
+endif
+
 # Host hardware architecture
 HOST_ARCH=@HOST_ARCH@
 # Target hardware architecture
 ARCH=@ARCH@
 TARGET_NATIVE_ARCH := $(ARCH)
 LLVM_NATIVE_ARCH := @LLVM_NATIVE_ARCH@
 
 # Indicates, whether we're cross-compiling LLVM or not

autoconf/config.sub

-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
         | -linux-newlib* | -linux-uclibc* \
         | -uxpv* | -beos* | -mpeix* | -udk* \
         | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
         | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
         | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
         | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
         | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
         | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-        | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+        | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -bitrig*)
   # Remember, each alternative MUST END IN *, to match a version number.
     ;;
   -qnx*)
     case $basic_machine in
         x86-* | i*86-*)
       ;;
         *)
       os=-nto$os

configure

*-*-netbsd*)
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
     llvm_cv_os_type="NetBSD"
     llvm_cv_platform_type="Unix" ;;
   *-*-dragonfly*)
     llvm_cv_link_all_option="-Wl,--whole-archive"
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
     llvm_cv_os_type="DragonFly"
     llvm_cv_platform_type="Unix" ;;
+  *-*-bitrig*)
+    llvm_cv_link_all_option="-Wl,--whole-archive"
+    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
+    llvm_cv_os_type="Bitrig"
+    llvm_cv_platform_type="Unix" ;;
   *-*-hpux*)
     llvm_cv_link_all_option="-Wl,--whole-archive"
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
     llvm_cv_os_type="HP-UX"
     llvm_cv_platform_type="Unix" ;;
   *-*-interix*)
     llvm_cv_link_all_option="-Wl,--whole-archive"
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
else
   *-*-kfreebsd-gnu)
     llvm_cv_target_os_type="GNU/kFreeBSD" ;;
   *-*-openbsd*)
     llvm_cv_target_os_type="OpenBSD" ;;
   *-*-netbsd*)
     llvm_cv_target_os_type="NetBSD" ;;
   *-*-dragonfly*)
     llvm_cv_target_os_type="DragonFly" ;;
+  *-*-bitrig*)
+    llvm_cv_target_os_type="Bitrig" ;;
   *-*-hpux*)
     llvm_cv_target_os_type="HP-UX" ;;
   *-*-interix*)
     llvm_cv_target_os_type="Interix" ;;
   *-*-linux*)
     llvm_cv_target_os_type="Linux" ;;
   *-*-gnu*)
     llvm_cv_target_os_type="GNU" ;;