metacc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14fc8ca9c502275a4cc8105906722c167fb58cf6a269559748da22cf88f83d3
-  data.tar.gz: f56a289ba4240caf683f8614f5317252753032ad8902cce314a0ab43380d05fd
+  metadata.gz: d74b463f2d62a82dbbe422b47e112052a25c95e8c51b957f01ec2545b2f8f227
+  data.tar.gz: 510bdbcba0c031de7909db0a989141afbecd9fa33bcf7b5066cf61d3dacc6f49
 SHA512:
-  metadata.gz: 2b5c6055a1445b3e0341fbde3da0ca9b76e2cfe021c0c7694be91233a2eb2c68de7f063cc5c2b9b953b697fdfa41f3a949b168eb33790d8544fedeeef90f222a
-  data.tar.gz: 30b826250c85ce5d7b57c83f81714d7ac51b6e911abed4ea8371e3bc36540f0b29779aeced94b398b7d590ffbbbf608c7ab2929f0d9743a8967824edad8bea59
+  metadata.gz: bbfda6722b4f9fa4b59a6be206a1b5ca0503d77f5833dbe5ba07f46525b1f157e4ac5ca7853f0f18ae7efd4f9c2782993a0991e101fd102523323abfeea97dd1
+  data.tar.gz: 15f59e0d6f45de8501b38aa6429624dd759d7d7b126ce18c0def60bdd2d56648f4b116483753e2f93da60c3e205ec5fd00813844e59b4975d7e3c81c01cfd590

data/bin/metacc

@@ -7,7 +7,13 @@ require "metacc/cli"
 
 begin
   MetaCC::CLI.new.run(ARGV)
-rescue MetaCC::CLI::InvalidOption, MetaCC::ToolchainNotFoundError => e
+rescue MetaCC::CLI::InvalidOption,
+       MetaCC::ToolchainNotFoundError,
+       OptionParser::AmbiguousOption,
+       OptionParser::MissingArgument,
+       OptionParser::NeedlessArgument,
+       OptionParser::InvalidArgument,
+       OptionParser::InvalidOption => e
   warn "#{$0} error: #{e.message}"
 rescue MetaCC::CompileError => e
   warn e.message

data/lib/metacc/cli.rb

@@ -9,57 +9,23 @@ module MetaCC
   #
   # Usage:
   #   metacc <sources...> -o <output> [options]       – compile source file(s)
-  #
-  # General:
-  #   -Wall -Werror
-  #   --std=c11 --std=c17 --std=c23
-  #   --std=c++11 --std=c++14 --std=c++17 --std=c++20 --std=c++23 --std=c++26
-  #
-  # Linking:
-  #   -c                 – compile only; don't link
-  #   -l, -L             - specify linker input
-  #   --shared           – produce a shared library
-  #   --static           – produce a static library
-  #   --lto              - enable link time optimization
-  #   --strip / -s       – strip unneeded symbols
-  #
-  # Code generation:
-  #   -O0, -O1, -O2, -O3                             - Set the optimization level
-  #   -msse4.2 -mavx -mavx2 -mavx512 --arch=native   - Compile for the given target
-  #   --no-rtti --no-exceptions
-  #   --pic
-  #
-  # Debugging:
-  #   --debug / -g
-  #   --asan --ubsan --msan
-  #
-  # Toolchain-specific flags (passed to Driver#compile via xflags:):
-  #   --xmsvc VALUE     – appended to xflags[MSVC]
-  #   --xgnu  VALUE     – appended to xflags[GNU]
-  #   --xclang VALUE    – appended to xflags[Clang]
-  #   --xclangcl VALUE  – appended to xflags[ClangCL]
   class CLI
 
-    # Maps long-form CLI flag names to Driver::RECOGNIZED_FLAGS symbols.
-    # Optimization-level flags are handled separately via -O LEVEL.
-    LONG_FLAGS = {
-      "lto" =>                       :lto,
-      "asan" =>                      :asan,
-      "ubsan" =>                     :ubsan,
-      "msan" =>                      :msan,
-      "no-rtti" =>                   :no_rtti,
-      "no-exceptions" =>             :no_exceptions,
-      "pic" =>                       :pic,
-      "no-semantic-interposition" => :no_semantic_interposition,
-      "no-omit-frame-pointer" =>     :no_omit_frame_pointer,
-      "no-strict-aliasing" =>        :no_strict_aliasing
-    }.freeze
-
     WARNING_CONFIGS = {
       "all" =>   :warn_all,
       "error" => :warn_error
     }
 
+    SANITIZERS = {
+      "address" =>   :asan,
+      "addr" =>      :asan,
+      "undefined" => :ubsan,
+      "ub" =>        :ubsan,
+      "memory" =>    :msan,
+      "mem" =>       :msan,
+      "leak" =>      :lsan
+    }
+
     TARGETS = {
       "sse4.2" => :sse4_2,
       "avx" =>    :avx,
@@ -85,7 +51,8 @@ module MetaCC
       "xmsvc" => MSVC,
       "xgnu" => GNU,
       "xclang" => Clang,
-      "xclangcl" => ClangCL
+      "xclangcl" => ClangCL,
+      "xtinycc" => TinyCC
     }.freeze
 
     def initialize(driver: Driver.new)
@@ -122,6 +89,11 @@ module MetaCC
     private
 
     def setup_compile_options(parser, options)
+      parser.require_exact = true
+
+      parser.separator ""
+      parser.separator "General options:"
+
       parser.on("-o FILEPATH", "Output file path") do |value|
         options[:output_path] = value
       end
@@ -131,26 +103,72 @@ module MetaCC
       parser.on("-D DEF", "Add a preprocessor definition") do |value|
         options[:defs] << value
       end
-      parser.on("-O LEVEL", /\A[0-3]|s\z/, "Optimization level (0–3)") do |level|
+      parser.on("--std=STANDARD", "Specify the language standard") do |value|
+        options[:flags] << STANDARDS[value]
+      end
+      parser.on("-W OPTION", "Configure warnings") do |value|
+        options[:flags] << WARNING_CONFIGS[value]
+      end
+      parser.on("-r", "--run", "Run the compiled executable after a successful build") do
+        options[:run] = true
+      end
+
+      parser.separator ""
+      parser.separator "Debugging:"
+
+      parser.on("-g", "--debug-info", "Emit debugging symbols") do
+        options[:flags] << :debug_info
+      end
+      parser.on("-S", "--sanitize SANITIZER", "Enable sanitizer (address, undefined, leak, memory)") do |value|
+        options[:flags] << SANITIZERS[value]
+      end
+
+      parser.separator ""
+      parser.separator "Optimization:"
+
+      parser.on("-O LEVEL", /\A[0-3]|s\z/, "Optimization level (0, 1, 2, 3, or s)") do |level|
         options[:flags] << :"o#{level}"
       end
-      parser.on("-m", "--arch ARCH", "Target architecture") do |value|
+      parser.on("--lto", "Enable link time optimization") do
+        options[:flags] << :lto
+      end
+      parser.on("--omit-frame-pointer") do |value|
+        options[:flags] << :omit_frame_pointer
+      end
+      parser.on("--strict-aliasing") do |value|
+        options[:flags] << :strict_aliasing
+      end
+
+      parser.separator ""
+      parser.separator "Code generation:"
+
+      parser.on("-m", "--arch=ARCH", "Target architecture") do |value|
         options[:flags] << TARGETS[value]
       end
-      parser.on("-g", "--debug", "Emit debugging symbols") do
-        options[:flags] << :debug
+      parser.on("--pic", "Generate position independent code") do |value|
+        options[:flags] << :pic
       end
-      parser.on("--std STANDARD", "Specify the language standard") do |value|
-        options[:flags] << STANDARDS[value]
+      parser.on("--no-rtti", "Disable runtime type information") do |value|
+        options[:flags] << :no_rtti
       end
-      parser.on("-W OPTION", "Configure warnings") do |value|
-        options[:flags] << WARNING_CONFIGS[value]
+      parser.on("--no-exceptions", "Disable exceptions (and unwinding info)") do |value|
+        options[:flags] << :no_exceptions
       end
-      parser.on("-c", "Produce object files") do
-        options[:link] = false
+
+      parser.separator ""
+      parser.separator "Linking:"
+
+      parser.on("--static", "Produce a static library") do
+        options[:flags] << :static
       end
-      parser.on("-r", "--run", "Run the compiled executable after a successful build") do
-        options[:run] = true
+      parser.on("--shared", "Produce a shared library") do |value|
+        options[:flags] << :shared
+      end
+      parser.on("--shared-compat", "Produce a shared library with full LD_PRELOAD compatability") do |value|
+        options[:flags] << :shared_compat
+      end
+      parser.on("-c", "Compile only (produce object files without linking)") do
+        options[:link] = false
       end
       parser.on("-l LIB", "Link against library LIB") do |value|
         options[:libs] << value
@@ -158,43 +176,46 @@ module MetaCC
       parser.on("-L DIR", "Add linker library search path") do |value|
         options[:link_paths] << value
       end
-      parser.on("--shared", "Produce a shared library") do
-        options[:flags] << :shared
-      end
-      parser.on("--static", "Produce a static library") do
-        options[:flags] << :static
-      end
+
       parser.on("-s", "--strip", "Strip unneeded symbols") do
         options[:flags] << :strip
       end
-      LONG_FLAGS.each do |name, sym|
-        parser.on("--#{name}") do
-          options[:flags] << sym
-        end
-      end
-      XFLAGS.each do |name, tc_class|
-        parser.on("--#{name} VALUE", "Pass VALUE to the #{tc_class} toolchain") do |value|
-          options[:xflags][tc_class] ||= []
-          options[:xflags][tc_class] << value
+
+      parser.separator ""
+      parser.separator "Compiler specific:"
+
+      XFLAGS.each do |name, toolchain_class|
+        toolchain_name = toolchain_class.name.split("::").last
+        parser.on("--#{name} FLAG", "Forward FLAG to the compiler if compiling with #{toolchain_name}") do |value|
+          options[:xflags][toolchain_class] ||= []
+          options[:xflags][toolchain_class] << value
         end
       end
+
+      parser.separator ""
+      parser.separator "Informational:"
+
       parser.on_tail("--version", "Print the toolchain version and exit") do
         puts @driver.toolchain.version_banner
         exit
       end
+      parser.on_tail("-h", "--help", "Show this message") do
+        puts parser
+        exit
+      end
     end
 
     def validate_options!(flags, output_path, link:, run:)
       if !link && output_path
-        raise InvalidOption, "cannot specify output path (-o) in compile only mode (-c)"
+        raise OptionParser::InvalidOption, "cannot specify output path (-o) in compile only mode (-c)"
       end
 
       if link && !output_path
-        raise InvalidOption, "must specify an output path (-o)"
+        raise OptionParser::InvalidOption, "must specify an output path (-o)"
       end
 
       if run && (!link || flags.include?(:shared) || flags.include?(:static))
-        raise InvalidOption, "--run may not be used with -c, --shared, or --static"
+        raise OptionParser::InvalidOption, "--run may not be used with -c, --shared, or --static"
       end
     end
 
@@ -209,8 +230,6 @@ module MetaCC
       end
     end
 
-    class InvalidOption < StandardError; end
-
   end
 
 end

data/lib/metacc/driver.rb

@@ -17,16 +17,16 @@ module MetaCC
 
     RECOGNIZED_FLAGS = Set.new(
       %i[
-        o0 o1 o2 o3 os
-        sse4_2 avx avx2 avx512 native
-        debug lto
         warn_all warn_error
         c11 c17 c23
         cxx11 cxx14 cxx17 cxx20 cxx23 cxx26
-        asan ubsan msan
-        no_rtti no_exceptions pic
-        no_semantic_interposition no_omit_frame_pointer no_strict_aliasing
-        shared static strip
+        o0 o1 o2 o3 os lto
+        sse4_2 avx avx2 avx512 native
+        asan ubsan msan lsan
+        debug_info
+        omit_frame_pointer strict_aliasing
+        no_rtti no_exceptions
+        pic shared shared_compat static strip
       ]
     ).freeze
 
@@ -154,6 +154,9 @@ module MetaCC
         raise "#{unrecognized_flag.inspect} is not a known flag"
       end
 
+      flags << :no_omit_frame_pointer unless flags.include?(:omit_frame_pointer)
+      flags << :no_strict_aliasing unless flags.include?(:strict_aliasing)
+
       flags.flat_map { |flag| @toolchain.flags[flag] }
     end
 

data/lib/metacc/toolchain.rb

@@ -150,41 +150,45 @@ module MetaCC
     end
 
     GNU_FLAGS = {
-      o0:                        ["-O0"],
-      o1:                        ["-O1"],
-      o2:                        ["-O2"],
-      o3:                        ["-O3"],
-      os:                        ["-Os"],
-      sse4_2:                    ["-march=x86-64-v2"], # This is a better match for /arch:SSE4.2 than -msse4_2 is
-      avx:                       ["-march=x86-64-v2", "-mavx"],
-      avx2:                      ["-march=x86-64-v3"], # This is a better match for /arch:AVX2 than -mavx2 is
-      avx512:                    ["-march=x86-64-v4"],
-      native:                    ["-march=native", "-mtune=native"],
-      debug:                     ["-g3"],
-      lto:                       ["-flto"],
-      warn_all:                  ["-Wall", "-Wextra", "-pedantic"],
-      warn_error:                ["-Werror"],
-      c11:                       ["-std=c11"],
-      c17:                       ["-std=c17"],
-      c23:                       ["-std=c23"],
-      cxx11:                     ["-std=c++11"],
-      cxx14:                     ["-std=c++14"],
-      cxx17:                     ["-std=c++17"],
-      cxx20:                     ["-std=c++20"],
-      cxx23:                     ["-std=c++23"],
-      cxx26:                     ["-std=c++2c"],
-      asan:                      ["-fsanitize=address"],
-      ubsan:                     ["-fsanitize=undefined"],
-      msan:                      ["-fsanitize=memory"],
-      no_rtti:                   ["-fno-rtti"],
-      no_exceptions:             ["-fno-exceptions", "-fno-unwind-tables"],
-      pic:                       ["-fPIC"],
-      no_semantic_interposition: ["-fno-semantic-interposition"],
-      no_omit_frame_pointer:     ["-fno-omit-frame-pointer"],
-      no_strict_aliasing:        ["-fno-strict-aliasing"],
-      shared:                    ["-shared"],
-      static:                    ["-static"],
-      strip:                     ["-Wl,--strip-unneeded"]
+      o0:                    ["-O0"],
+      o1:                    ["-O1"],
+      o2:                    ["-O2"],
+      o3:                    ["-O3"],
+      os:                    ["-Os"],
+      sse4_2:                ["-march=x86-64-v2"], # This is a better match for /arch:SSE4.2 than -msse4_2 is
+      avx:                   ["-march=x86-64-v2", "-mavx"],
+      avx2:                  ["-march=x86-64-v3"], # This is a better match for /arch:AVX2 than -mavx2 is
+      avx512:                ["-march=x86-64-v4"],
+      native:                ["-march=native", "-mtune=native"],
+      debug_info:            ["-g3"],
+      lto:                   ["-flto"],
+      warn_all:              ["-Wall", "-Wextra", "-pedantic"],
+      warn_error:            ["-Werror"],
+      c11:                   ["-std=c11"],
+      c17:                   ["-std=c17"],
+      c23:                   ["-std=c23"],
+      cxx11:                 ["-std=c++11"],
+      cxx14:                 ["-std=c++14"],
+      cxx17:                 ["-std=c++17"],
+      cxx20:                 ["-std=c++20"],
+      cxx23:                 ["-std=c++23"],
+      cxx26:                 ["-std=c++2c"],
+      asan:                  ["-fsanitize=address"],
+      ubsan:                 ["-fsanitize=undefined"],
+      msan:                  ["-fsanitize=memory"],
+      lsan:                  ["-fsanitize=leak"],
+      no_rtti:               ["-fno-rtti"],
+      no_exceptions:         ["-fno-exceptions", "-fno-unwind-tables"],
+      pic:                   ["-fPIC"],
+      omit_frame_pointer:    ["-fomit-frame-pointer"],
+      no_omit_frame_pointer: ["-fno-omit-frame-pointer"],
+      strict_aliasing:       ["-fstrict-aliasing"],
+      no_strict_aliasing:    ["-fno-strict-aliasing"],
+      shared:                ["-shared", "-Bsymbolic-non-weak-functions", "-fno-semantic-interposition"],
+      shared_compat:         ["-shared"],
+      static:                ["-static"],
+      strip:                 ["-Wl,--strip-unneeded"],
+      debug:                 ["-D_GLIBCXX_DEBUG", "-fasynchronous-unwind-tables"]
     }.freeze
 
     def flags
@@ -254,41 +258,44 @@ module MetaCC
     end
 
     MSVC_FLAGS = {
-      o0:                        ["/Od"],
-      o1:                        ["/O1"],
-      o2:                        ["/O2"],
-      o3:                        ["/O2", "/Ob3"],
-      os:                        ["/O1"],
-      sse4_2:                    ["/arch:SSE4.2"],
-      avx:                       ["/arch:AVX"],
-      avx2:                      ["/arch:AVX2"],
-      avx512:                    ["/arch:AVX512"],
-      native:                    [],
-      debug:                     ["/Zi"],
-      lto:                       ["/GL"],
-      warn_all:                  ["/W4"],
-      warn_error:                ["/WX"],
-      c11:                       ["/std:c11"],
-      c17:                       ["/std:c17"],
-      c23:                       ["/std:clatest"],
-      cxx11:                     [],
-      cxx14:                     ["/std:c++14"],
-      cxx17:                     ["/std:c++17"],
-      cxx20:                     ["/std:c++20"],
-      cxx23:                     ["/std:c++23preview"],
-      cxx26:                     ["/std:c++latest"],
-      asan:                      ["/fsanitize=address"],
-      ubsan:                     [],
-      msan:                      [],
-      no_rtti:                   ["/GR-"],
-      no_exceptions:             ["/EHs-", "/EHc-"],
-      pic:                       [],
-      no_semantic_interposition: [],
-      no_omit_frame_pointer:     ["/Oy-"],
-      no_strict_aliasing:        [],
-      shared:                    ["/LD"],
-      static:                    ["/c"],
-      strip:                     []
+      o0:                    ["/Od"],
+      o1:                    ["/O1"],
+      o2:                    ["/O2"],
+      o3:                    ["/O2", "/Ob3"],
+      os:                    ["/O1"],
+      sse4_2:                ["/arch:SSE4.2"],
+      avx:                   ["/arch:AVX"],
+      avx2:                  ["/arch:AVX2"],
+      avx512:                ["/arch:AVX512"],
+      native:                [],
+      debug_info:            ["/Zi"],
+      lto:                   ["/GL"],
+      warn_all:              ["/W4"],
+      warn_error:            ["/WX"],
+      c11:                   ["/std:c11"],
+      c17:                   ["/std:c17"],
+      c23:                   ["/std:clatest"],
+      cxx11:                 [],
+      cxx14:                 ["/std:c++14"],
+      cxx17:                 ["/std:c++17"],
+      cxx20:                 ["/std:c++20"],
+      cxx23:                 ["/std:c++23preview"],
+      cxx26:                 ["/std:c++latest"],
+      asan:                  ["/fsanitize=address"],
+      ubsan:                 [],
+      msan:                  [],
+      lsan:                  [],
+      no_rtti:               ["/GR-"],
+      no_exceptions:         ["/EHs-", "/EHc-"],
+      pic:                   [],
+      omit_frame_pointer:    ["/Oy"],
+      no_omit_frame_pointer: ["/Oy-"],
+      strict_aliasing:       ["-fstrict-aliasing"],
+      no_strict_aliasing:    ["-fno-strict-aliasing"],
+      shared:                ["/LD"],
+      shared_compat:         ["/LD"],
+      static:                ["/c"],
+      strip:                 []
     }.freeze
 
     def flags
@@ -416,6 +423,7 @@ module MetaCC
         object_files = input_files.map { |f| f.sub(/\.c\z/, ".o") }
         commands << [@ar, "rcs", output_file, *object_files]
       end
+      commands
     end
 
     # TinyCC does not support C++.
@@ -428,41 +436,42 @@ module MetaCC
     end
 
     TINYCC_FLAGS = {
-      o0:                        [],
-      o1:                        ["-O1"],
-      o2:                        ["-O2"],
-      o3:                        ["-O2"],
-      os:                        [],
-      sse4_2:                    [],
-      avx:                       [],
-      avx2:                      [],
-      avx512:                    [],
-      native:                    [],
-      debug:                     ["-g"],
-      lto:                       [],
-      warn_all:                  ["-Wall"],
-      warn_error:                ["-Werror"],
-      c11:                       [],
-      c17:                       [],
-      c23:                       [],
-      cxx11:                     [],
-      cxx14:                     [],
-      cxx17:                     [],
-      cxx20:                     [],
-      cxx23:                     [],
-      cxx26:                     [],
-      asan:                      [],
-      ubsan:                     [],
-      msan:                      [],
-      no_rtti:                   [],
-      no_exceptions:             [],
-      pic:                       [],
-      no_semantic_interposition: [],
-      no_omit_frame_pointer:     [],
-      no_strict_aliasing:        [],
-      shared:                    ["-shared"],
-      static:                    ["-c"],
-      strip:                     []
+      o0:                 [],
+      o1:                 ["-O1"],
+      o2:                 ["-O2"],
+      o3:                 ["-O2"],
+      os:                 [],
+      sse4_2:             [],
+      avx:                [],
+      avx2:               [],
+      avx512:             [],
+      native:             [],
+      debug_info:         ["-g"],
+      lto:                [],
+      warn_all:           ["-Wall"],
+      warn_error:         ["-Werror"],
+      c11:                [],
+      c17:                [],
+      c23:                [],
+      cxx11:              [],
+      cxx14:              [],
+      cxx17:              [],
+      cxx20:              [],
+      cxx23:              [],
+      cxx26:              [],
+      asan:               [],
+      ubsan:              [],
+      msan:               [],
+      leak:               [],
+      no_rtti:            [],
+      no_exceptions:      [],
+      pic:                [],
+      keep_frame_pointer: [],
+      relaxed_aliasing:   [],
+      shared:             ["-shared"],
+      shared_compat:      ["-shared"],
+      static:             ["-c"],
+      strip:              []
     }.freeze
 
     def flags

data/lib/metacc/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module MetaCC
 
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Praneeth Sadda