Merge pull request #61 from opendlang/upstreamstuff

Upstream stuff

Author: adamdruppe

compiler/src/build.d

@@ -1200,7 +1200,15 @@ void parseEnvironment()
 
     // detect Model
     auto model = env.setDefault("MODEL", detectModel);
-    env["MODEL_FLAG"] = "-m" ~ env["MODEL"];
+    if (env.getDefault("DFLAGS", "").canFind("-mtriple", "-march"))
+    {
+        // Don't pass `-m32|64` flag when explicitly passing triple or arch.
+        env["MODEL_FLAG"] = "";
+    }
+    else
+    {
+        env["MODEL_FLAG"] = "-m" ~ env["MODEL"];
+    }
 
     // detect PIC
     version(Posix)
@@ -1690,7 +1698,7 @@ string detectModel()
     else
         uname = ["uname", "-m"].execute.output;
 
-    if (uname.canFind("x86_64", "amd64", "64-bit", "64-Bit", "64 bit"))
+    if (uname.canFind("x86_64", "amd64", "arm64", "64-bit", "64-Bit", "64 bit"))
         return "64";
     if (uname.canFind("i386", "i586", "i686", "32-bit", "32-Bit", "32 bit"))
         return "32";
@@ -2348,31 +2356,5 @@ void copyAndTouch(const string from, const string to)
     to.setTimes(now, now);
 }
 
-version (OSX)
-{
-    // FIXME: Parallel executions hangs reliably on Mac  (esp. the 'macair'
-    // host used by the autotester) for unknown reasons outside of this script.
-    pragma(msg, "Warning: Syncing file access because of OSX!");
-
-    // Wrap standard library functions to ensure mutually exclusive file access
-    alias readText = fileAccess!(std.file.readText, string);
-    alias writeText = fileAccess!(std.file.write, string, string);
-    alias timeLastModified = fileAccess!(std.file.timeLastModified, string);
-
-    import core.sync.mutex;
-    __gshared Mutex fileAccessMutex;
-    shared static this() {
-        fileAccessMutex = new Mutex();
-    }
-
-    auto fileAccess(alias dg, T...)(T args)
-    {
-        fileAccessMutex.lock_nothrow();
-        scope (exit) fileAccessMutex.unlock_nothrow();
-        return dg(args);
-    }
-}
-else
-{
-    alias writeText = std.file.write;
-}
+// Wrap standard library functions
+alias writeText = std.file.write;

compiler/src/dmd/backend/dwarfdbginf.d

@@ -16,15 +16,19 @@
 Some generic information for debug info on macOS:
 
 The linker on macOS will remove any debug info, i.e. every section with the
-`S_ATTR_DEBUG` flag, this includes everything in the `__DWARF` section. By using
-the `S_REGULAR` flag the linker will not remove this section. This allows to get
-the filenames and line numbers for backtraces from the executable.
+`S_ATTR_DEBUG` flag, this includes everything in the `__DWARF` section.
+Because of this, it is not possible to get filenames and line numbers for
+backtraces from the executable alone.
 
 Normally the linker removes all the debug info but adds a reference to the
 object files. The debugger can then read the object files to get filename and
 line number information. It's also possible to use an additional tool that
 generates a separate `.dSYM` file. This file can then later be deployed with the
 application if debug info is needed when the application is deployed.
+
+Support in core.runtime for getting filename and line number for backtraces
+from these `.dSYM` files will need to be investigated.
+See: https://issues.dlang.org/show_bug.cgi?id=20510
 */
 
 module dmd.backend.dwarfdbginf;
@@ -476,7 +480,7 @@ static if (1)
         {
             name = n;
             if (config.objfmt == OBJ_MACH)
-                flags = S_ATTR_DEBUG;
+                flags = S_REGULAR | S_ATTR_DEBUG;
             else
                 flags = SHT_PROGBITS;
         }
@@ -550,10 +554,7 @@ static if (1)
         debug_abbrev   = Section("__debug_abbrev");
         debug_info     = Section("__debug_info");
         debug_str      = Section("__debug_str");
-        // We use S_REGULAR to make sure the linker doesn't remove this section. Needed
-        // for filenames and line numbers in backtraces.
         debug_line     = Section("__debug_line");
-        debug_line.flags = S_REGULAR;
     }
     void elfDebugSectionsInit()
     {

compiler/src/dmd/backend/mach.d

@@ -94,6 +94,12 @@ enum
     LC_SYMTAB       = 2,
     LC_DYSYMTAB     = 11,
     LC_SEGMENT_64   = 0x19,
+
+    /// Build for MacOSX min OS version.
+    LC_VERSION_MIN_MACOSX = 0x24,
+
+    /// Build for platform min OS version.
+    LC_BUILD_VERSION = 0x32,
 }
 
 struct load_command
@@ -407,3 +413,62 @@ struct scattered_relocation_info
 
     int r_value;
 }
+
+/**
+ * The version_min_command contains the min OS version on which this binary was
+ * built to run.
+ */
+struct version_min_command
+{
+    ///
+    uint cmd = LC_VERSION_MIN_MACOSX;
+
+    ///
+    uint cmdsize = typeof(this).sizeof;
+
+    /// X.Y.Z is encoded in nibbles xxxx.yy.zz
+    uint version_;
+
+    /// X.Y.Z is encoded in nibbles xxxx.yy.zz
+    uint sdk = 0;
+}
+
+/**
+ * The `build_version_command` contains the min OS version on which this binary
+ * was built to run for its platform.
+ */
+struct build_version_command
+{
+    ///
+    uint cmd = LC_BUILD_VERSION;
+
+    ///
+    uint cmdsize = typeof(this).sizeof;
+
+    /// Platform
+    uint platform = PLATFORM_MACOS;
+
+    /// X.Y.Z is encoded in nibbles xxxx.yy.zz
+    uint minos;
+
+    /// X.Y.Z is encoded in nibbles xxxx.yy.zz
+    uint sdk = 0;
+
+    /// Number of tool entries following this
+    uint ntools = 0;
+}
+
+/// Known values for the platform field in `build_version_command`
+enum
+{
+    PLATFORM_MACOS = 1,
+    PLATFORM_IOS = 2,
+    PLATFORM_TVOS = 3,
+    PLATFORM_WATCHOS = 4,
+    PLATFORM_BRIDGEOS = 5,
+    PLATFORM_MACCATALYST = 6,
+    PLATFORM_IOSSIMULATOR = 7,
+    PLATFORM_TVOSSIMULATOR = 8,
+    PLATFORM_WATCHOSSIMULATOR = 9,
+    PLATFORM_DRIVERKIT = 10
+}