r206431 - Rename lib/Headers/module.map to module.modulemap

[Ben Langmuir]

Author: benlangmuir
Date: Wed Apr 16 19:52:48 2014
New Revision: 206431

URL: http://llvm.org/viewvc/llvm-project?rev=206431&view=rev
Log:
Rename lib/Headers/module.map to module.modulemap

Don't install a file using the legacy spelling.

Added:
    cfe/trunk/lib/Headers/module.modulemap
      - copied, changed from r206420, cfe/trunk/lib/Headers/module.map
Removed:
    cfe/trunk/lib/Headers/module.map
Modified:
    cfe/trunk/docs/Modules.rst
    cfe/trunk/lib/Headers/CMakeLists.txt
    cfe/trunk/lib/Headers/Makefile

Modified: cfe/trunk/docs/Modules.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/Modules.rst?rev=206431&r1=206430&r2=206431&view=diff
==============================================================================
--- cfe/trunk/docs/Modules.rst (original)
+++ cfe/trunk/docs/Modules.rst Wed Apr 16 19:52:48 2014
@@ -839,7 +839,7 @@ Where To Learn More About Modules
 =================================
 The Clang source code provides additional information about modules:
 
-``clang/lib/Headers/module.map``
+``clang/lib/Headers/module.modulemap``
   Module map for Clang's compiler-specific header files.
 
 ``clang/test/Modules/``

Modified: cfe/trunk/lib/Headers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=206431&r1=206430&r2=206431&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/CMakeLists.txt (original)
+++ cfe/trunk/lib/Headers/CMakeLists.txt Wed Apr 16 19:52:48 2014
@@ -45,7 +45,7 @@ set(files
   xopintrin.h
   cpuid.h
   unwind.h
-  module.map
+  module.modulemap
   )
 
 set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)

Modified: cfe/trunk/lib/Headers/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Makefile?rev=206431&r1=206430&r2=206431&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/Makefile (original)
+++ cfe/trunk/lib/Headers/Makefile Wed Apr 16 19:52:48 2014
@@ -32,13 +32,13 @@ $(HeaderDir)/arm_neon.h: $(BUILT_SOURCES
 	$(Verb) cp $< $@
 	$(Echo) Copying $(notdir $<) to build dir
 
-$(HeaderDir)/module.map: $(PROJ_SRC_DIR)/module.map $(HeaderDir)/.dir
+$(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.dir
 	$(Verb) cp $< $@
 	$(Echo) Copying $(notdir $<) to build dir
 
 
 # Hook into the standard Makefile rules.
-all-local:: $(OBJHEADERS) $(HeaderDir)/module.map
+all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
 
 PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
 
@@ -52,12 +52,12 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(H
 	$(Verb) $(DataInstall) $< $(PROJ_headers)
 	$(Echo) Installing compiler include file: $(notdir $<)
 
-$(PROJ_headers)/module.map: $(HeaderDir)/module.map | $(PROJ_headers)
+$(PROJ_headers)/module.modulemap: $(HeaderDir)/module.modulemap | $(PROJ_headers)
 	$(Verb) $(DataInstall) $< $(PROJ_headers)
 	$(Echo) Installing compiler module map file: $(notdir $<)
 
 
-install-local:: $(INSTHEADERS) $(PROJ_headers)/module.map
+install-local:: $(INSTHEADERS) $(PROJ_headers)/module.modulemap
 
 $(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(CLANG_TBLGEN) $(ObjDir)/.dir
 	$(Echo) "Building Clang arm_neon.h.inc with tblgen"

Removed: cfe/trunk/lib/Headers/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.map?rev=206430&view=auto
==============================================================================
--- cfe/trunk/lib/Headers/module.map (original)
+++ cfe/trunk/lib/Headers/module.map (removed)
@@ -1,156 +0,0 @@
-module _Builtin_intrinsics [system] {
-  explicit module altivec {
-    requires altivec
-    header "altivec.h"
-  }
-
-  explicit module arm {
-    requires arm
-
-    explicit module neon {
-      requires neon
-      header "arm_neon.h"
-      export *
-    }
-  }
-
-  explicit module intel {
-    requires x86
-    export *
-
-    header "immintrin.h"
-    header "x86intrin.h"
-
-    explicit module mm_malloc {
-      header "mm_malloc.h"
-      export * // note: for <stdlib.h> dependency
-    }
-
-    explicit module cpuid {
-      requires x86
-      header "cpuid.h"
-    }
-
-    explicit module mmx {
-      requires mmx
-      header "mmintrin.h"
-    }
-
-    explicit module f16c {
-      requires f16c
-      header "f16cintrin.h"
-    }
-
-    explicit module sse {
-      requires sse
-      export mmx
-      export * // note: for hackish <emmintrin.h> dependency
-      header "xmmintrin.h"
-    }
-
-    explicit module sse2 {
-      requires sse2
-      export sse
-      header "emmintrin.h"
-    }
-
-    explicit module sse3 {
-      requires sse3
-      export sse2
-      header "pmmintrin.h"
-    }
-
-    explicit module ssse3 {
-      requires ssse3
-      export sse3
-      header "tmmintrin.h"
-    }
-
-    explicit module sse4_1 {
-      requires sse41
-      export ssse3
-      header "smmintrin.h"
-    }
-
-    explicit module sse4_2 {
-      requires sse42
-      export sse4_1
-      header "nmmintrin.h"
-    }
-
-    explicit module sse4a {
-      requires sse4a
-      export sse3
-      header "ammintrin.h"
-    }
-
-    explicit module avx {
-      requires avx
-      export sse4_2
-      header "avxintrin.h"
-    }
-
-    explicit module avx2 {
-      requires avx2
-      export avx
-      header "avx2intrin.h"
-    }
-
-    explicit module bmi {
-      requires bmi
-      header "bmiintrin.h"
-    }
-
-    explicit module bmi2 {
-      requires bmi2
-      header "bmi2intrin.h"
-    }
-
-    explicit module fma {
-      requires fma
-      header "fmaintrin.h"
-    }
-
-    explicit module fma4 {
-      requires fma4
-      export sse3
-      header "fma4intrin.h"
-    }
-
-    explicit module lzcnt {
-      requires lzcnt
-      header "lzcntintrin.h"
-    }
-
-    explicit module popcnt {
-      requires popcnt
-      header "popcntintrin.h"
-    }
-
-    explicit module mm3dnow {
-      requires mm3dnow
-      header "mm3dnow.h"
-    }
-
-    explicit module xop {
-      requires xop
-      export fma4
-      header "xopintrin.h"
-    }
-
-    explicit module aes_pclmul {
-      requires aes, pclmul
-      header "wmmintrin.h"
-    }
-
-    explicit module aes {
-      requires aes
-      header "__wmmintrin_aes.h"
-    }
-
-    explicit module pclmul {
-      requires pclmul
-      header "__wmmintrin_pclmul.h"
-    }
-  }
-}

Copied: cfe/trunk/lib/Headers/module.modulemap (from r206420, cfe/trunk/lib/Headers/module.map)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/module.modulemap?p2=cfe/trunk/lib/Headers/module.modulemap&p1=cfe/trunk/lib/Headers/module.map&r1=206420&r2=206431&rev=206431&view=diff
==============================================================================
    (empty)