From 06322fd510f3899f7a6c743760528333d9f28506 Mon Sep 17 00:00:00 2001 From: Greg V Date: Wed, 27 Jun 2018 17:24:41 +0300 Subject: Move src/include/string_view.hpp into own namespace libc++ offers std::string_view regardless of -std flag, so defining a custom std::string_view results in a conflict. This one is actually not a precise clone of the real one (uses two pointers instead of pointer+length). --- src/include/string_view.hpp | 3 ++- src/main.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/include/string_view.hpp b/src/include/string_view.hpp index 7d049e9e..a0cf596b 100644 --- a/src/include/string_view.hpp +++ b/src/include/string_view.hpp @@ -10,7 +10,8 @@ #include // size_t #include // ostream -namespace std { +namespace stdx { +using namespace std; class string_view { diff --git a/src/main.cpp b/src/main.cpp index 75c078ee..8f2740fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1077,14 +1077,14 @@ ProgramParams::ProgramParams(int argc, char *argv[]) { const char* end = strchr(a, ':'); - ::std::string_view s; + ::stdx::string_view s; if( end ) { - s = ::std::string_view { a, end }; + s = ::stdx::string_view { a, end }; a = end + 1; } else { end = a + strlen(a); - s = ::std::string_view { a, end }; + s = ::stdx::string_view { a, end }; a = end; } -- cgit v1.2.3 From 671d31dc2e3b3a2812d98acb8fc0e5a26ec5e3c0 Mon Sep 17 00:00:00 2001 From: Greg V Date: Wed, 27 Jun 2018 18:05:00 +0300 Subject: Add FreeBSD and DragonFly targets Also adjust macOS comment. FreeBSD also uses clang and lld (current dev version even uses lld as /usr/bin/ld), function-sections/gc-sections are very well supported. It's probably a Mach-O issue on Macs. --- src/expand/proc_macro.cpp | 2 +- src/trans/target.cpp | 53 ++++++++++++++++++++++++++++++++++++++++---- tools/common/target_detect.h | 16 +++++++++++++ tools/minicargo/build.cpp | 11 +++++++++ 4 files changed, 77 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/expand/proc_macro.cpp b/src/expand/proc_macro.cpp index 969f75b0..7d953e37 100644 --- a/src/expand/proc_macro.cpp +++ b/src/expand/proc_macro.cpp @@ -24,7 +24,7 @@ # include #endif -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) extern char **environ; #endif diff --git a/src/trans/target.cpp b/src/trans/target.cpp index 1727cdba..72d81edd 100644 --- a/src/trans/target.cpp +++ b/src/trans/target.cpp @@ -361,6 +361,34 @@ namespace ARCH_X86_64 }; } + else if(target_name == "i686-unknown-freebsd") + { + return TargetSpec { + "unix", "freebsd", "gnu", {CodegenMode::Gnu11, "i686-unknown-freebsd", BACKEND_C_OPTS_GNU}, + ARCH_X86 + }; + } + else if(target_name == "x86_64-unknown-freebsd") + { + return TargetSpec { + "unix", "freebsd", "gnu", {CodegenMode::Gnu11, "x86_64-unknown-freebsd", BACKEND_C_OPTS_GNU}, + ARCH_X86_64 + }; + } + else if(target_name == "arm-unknown-freebsd") + { + return TargetSpec { + "unix", "freebsd", "gnu", {CodegenMode::Gnu11, "arm-unknown-freebsd", BACKEND_C_OPTS_GNU}, + ARCH_ARM32 + }; + } + else if(target_name == "aarch64-unknown-freebsd") + { + return TargetSpec { + "unix", "freebsd", "gnu", {CodegenMode::Gnu11, "aarch64-unknown-freebsd", BACKEND_C_OPTS_GNU}, + ARCH_ARM64 + }; + } else if(target_name == "x86_64-unknown-netbsd") { return TargetSpec { @@ -396,9 +424,16 @@ namespace ARCH_ARM64 }; } + else if(target_name == "x86_64-unknown-dragonfly") + { + return TargetSpec { + "unix", "dragonfly", "gnu", {CodegenMode::Gnu11, "x86_64-unknown-dragonfly", BACKEND_C_OPTS_GNU}, + ARCH_X86_64 + }; + } else if(target_name == "x86_64-apple-macosx") { - // NOTE: OSX uses clang and lld, which don't fully support the defaults used for GNU targets + // NOTE: OSX uses Mach-O binaries, which don't fully support the defaults used for GNU targets return TargetSpec { "unix", "macos", "gnu", {CodegenMode::Gnu11, "x86_64-apple-darwin", {}, {}}, ARCH_X86_64 @@ -438,22 +473,32 @@ void Target_SetCfg(const ::std::string& target_name) Cfg_SetFlag("linux"); Cfg_SetValue("target_vendor", "gnu"); } - Cfg_SetValue("target_env", g_target.m_env_name); + + if( g_target.m_os_name == "freebsd" ) + { + Cfg_SetFlag("freebsd"); + Cfg_SetValue("target_vendor", "unknown"); + } if( g_target.m_os_name == "netbsd" ) { Cfg_SetFlag("netbsd"); Cfg_SetValue("target_vendor", "unknown"); } - Cfg_SetValue("target_env", g_target.m_env_name); if( g_target.m_os_name == "openbsd" ) { Cfg_SetFlag("openbsd"); Cfg_SetValue("target_vendor", "unknown"); } - Cfg_SetValue("target_env", g_target.m_env_name); + if( g_target.m_os_name == "dragonfly" ) + { + Cfg_SetFlag("dragonfly"); + Cfg_SetValue("target_vendor", "unknown"); + } + + Cfg_SetValue("target_env", g_target.m_env_name); Cfg_SetValue("target_os", g_target.m_os_name); Cfg_SetValue("target_pointer_width", FMT(g_target.m_arch.m_pointer_bits)); Cfg_SetValue("target_endian", g_target.m_arch.m_big_endian ? "big" : "little"); diff --git a/tools/common/target_detect.h b/tools/common/target_detect.h index 995ab6a4..a4c44ba4 100644 --- a/tools/common/target_detect.h +++ b/tools/common/target_detect.h @@ -34,6 +34,19 @@ # else # define DEFAULT_TARGET_NAME "i586-windows-gnu" # endif +// - FreeBSD +#elif defined(__FreeBSD__) +# if defined(__amd64__) +# define DEFAULT_TARGET_NAME "x86_64-unknown-freebsd" +# elif defined(__aarch64__) +# define DEFAULT_TARGET_NAME "aarch64-unknown-freebsd" +# elif defined(__arm__) +# define DEFAULT_TARGET_NAME "arm-unknown-freebsd" +# elif defined(__i386__) +# define DEFAULT_TARGET_NAME "i686-unknown-freebsd" +# else +# warning "Unable to detect a suitable default target (FreeBSD)" +# endif // - NetBSD #elif defined(__NetBSD__) # if defined(__amd64__) @@ -54,6 +67,9 @@ # else # warning "Unable to detect a suitable default target (OpenBSD)" # endif +// - DragonFly +#elif defined(__DragonFly__) +# define DEFAULT_TARGET_NAME "x86_64-unknown-dragonfly" // - Apple devices #elif defined(__APPLE__) # define DEFAULT_TARGET_NAME "x86_64-apple-macosx" diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp index 42e19552..20380a0d 100644 --- a/tools/minicargo/build.cpp +++ b/tools/minicargo/build.cpp @@ -45,6 +45,9 @@ extern int _putenv_s(const char*, const char*); #ifdef __APPLE__ # include #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) // NetBSD 8.0+ +# include +#endif #ifdef _WIN32 # define EXESUF ".exe" @@ -564,6 +567,14 @@ Builder::Builder(BuildOptions opts): } else // TODO: Buffer too small +#elif defined(__FreeBSD__) || defined(__DragonFly__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) // NetBSD 8.0+ + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t s = sizeof(buf); + if ( sysctl(mib, 4, buf, &s, NULL, 0) == 0 ) + { + // Buffer populated + } + else #else # warning "Can't runtime determine path to minicargo" #endif -- cgit v1.2.3