Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f118d102 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge branch 'jb-mr1-release' into mr1-staging 

Change-Id: Ic74b8fa4616853bd6b5da43c215d74ea993d4f68
parents f8ec78a4 85f6bdb7

CleanSpec.mk

+23 −0
Original line number Diff line number Diff line
@@ -127,6 +127,29 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# Now we switched to build against Mac OS X SDK 10.6

$(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj)



$(call add-clean-step, rm -f $(OUT_DIR)/versions_checked.mk)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o)



# JB MR2!!!!!!!  AND *NO*, THIS WILL NOT BE K-WHATEVER.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+58 −48
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ is_tests_build := $(filter tests,$(MAKECMDGOALS)) 


# -----------------------------------------------------------------

# Define rules to copy PRODUCT_COPY_FILES defined by the product.

# PRODUCT_COPY_FILES contains words like <source file>:<dest file>.

# PRODUCT_COPY_FILES contains words like <source file>:<dest file>[:<owner>].

# <dest file> is relative to $(PRODUCT_OUT), so it should look like,

# e.g., "system/etc/file.xml".

# The filter part means "only eval the copy-one-file rule if this
@@ -379,16 +379,13 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ 


BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img



ifeq ($(HAVE_SELINUX),true)

SELINUX_DEPENDS := sepolicy file_contexts seapp_contexts

endif



# We just build this directly to the install location.

INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET)

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(SELINUX_DEPENDS) | $(MINIGZIP)

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) | $(MINIGZIP)

	$(call pretty,"Target ram disk: $@")

	$(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@





ifneq ($(strip $(TARGET_NO_KERNEL)),true)



# -----------------------------------------------------------------
@@ -415,7 +412,6 @@ ifdef BOARD_KERNEL_PAGESIZE 
  INTERNAL_BOOTIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)

endif



BOARD_FORCE_RAMDISK_ADDRESS := $(strip $(BOARD_FORCE_RAMDISK_ADDRESS))

ifneq ($(BOARD_FORCE_RAMDISK_ADDRESS),)

  INTERNAL_BOOTIMAGE_ARGS += --ramdiskaddr $(BOARD_FORCE_RAMDISK_ADDRESS)

endif
@@ -435,7 +431,7 @@ else ifndef BOARD_CUSTOM_BOOTIMG_MK # TARGET_BOOTIMAGE_USE_EXT2 != true 


$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
@@ -647,12 +643,13 @@ recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/r 
recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root))

recovery_resource_deps := $(shell find $(recovery_resources_common) \

  $(recovery_resources_private) $(recovery_root_private) -type f)



ifneq ($(TARGET_RECOVERY_FSTAB),)

  recovery_fstab := $(strip $(wildcard $(TARGET_RECOVERY_FSTAB)))

else

  recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))

endif

# Named '.dat' so we don't attempt to use imgdiff for patching it.

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT)/etc/recovery-resource.dat



ifeq ($(recovery_resources_private),)

  $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))
@@ -715,27 +712,28 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ 
		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

	@echo -e ${CL_CYN}"----- Making recovery filesystem ------"${CL_RST}

	mkdir -p $(TARGET_RECOVERY_OUT)

	mkdir -p $(TARGET_RECOVERY_ROOT_OUT)

	mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc

	mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/tmp

	$(hide) rm -rf $(TARGET_RECOVERY_OUT)

	$(hide) mkdir -p $(TARGET_RECOVERY_OUT)

	$(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp

	@echo -e ${CL_CYN}"Copying baseline ramdisk..."${CL_RST}

	cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)

	rm $(TARGET_RECOVERY_ROOT_OUT)/init*.rc

	$(hide) cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)

	@echo -e ${CL_CYN}"Modifying ramdisk contents..."${CL_RST}

	cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/init.rc

	cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/

	$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc

	$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/init.rc



	$(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/

	$(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/

	rm -f $(TARGET_RECOVERY_ROOT_OUT)/init.*.rc

	mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/bin

	cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/

	$(foreach item,$(recovery_resources_private), \

	$(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/

	$(hide) $(foreach item,$(recovery_resources_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)

	$(foreach item,$(recovery_root_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_OUT)/)

	$(foreach item,$(recovery_fstab), \

	$(hide) $(foreach item,$(recovery_fstab), \

	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)

	cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys

	cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \

	$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys

	$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \

	        > $(TARGET_RECOVERY_ROOT_OUT)/default.prop

	@echo -e ${CL_YLW}"Modifying default.prop"${CL_RST}

	sed -i 's/ro.build.date.utc=.*/ro.build.date.utc=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop
@@ -757,17 +755,22 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \ 
		$(recovery_ramdisk) \

		$(recovery_kernel)

	@echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST}

	$(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) --output $@

	@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}

	$(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)

	@echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}

endif



$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)

	$(hide) mkdir -p $(dir $@)

	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrj $@ -@



else

INSTALLED_RECOVERYIMAGE_TARGET :=

RECOVERY_RESOURCE_ZIP :=

endif



.PHONY: recoveryimage

recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET)

recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)



INSTALLED_RECOVERYZIP_TARGET := $(PRODUCT_OUT)/utilities/update.zip

$(INSTALLED_RECOVERYZIP_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(TARGET_OUT)/bin/updater $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar
@@ -797,13 +800,18 @@ endif 
# -----------------------------------------------------------------

# system image

#

# Remove overridden packages from $(ALL_PDK_FUSION_FILES)

PDK_FUSION_SYSIMG_FILES := \

    $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \

        $(ALL_PDK_FUSION_FILES))



INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \

    $(ALL_PREBUILT) \

    $(ALL_COPIED_HEADERS) \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(ALL_PDK_FUSION_FILES))

    $(PDK_FUSION_SYSIMG_FILES) \

    $(RECOVERY_RESOURCE_ZIP))



ifdef is_tests_build

# We don't want to install tests modules to the system partition
@@ -813,7 +821,7 @@ ifdef is_tests_build 
#    $(tests_MODULES))

endif



FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS) $(SELINUX_DEPENDS)

FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)

# -----------------------------------------------------------------

# installed file list

# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.
@@ -943,7 +951,8 @@ $(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) 
	$(hide) rm -f $@

	$(hide) cd $(dir $@) && zip -qry $(notdir $@) \

		$(TARGET_COPY_OUT_SYSTEM) \

		$(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES))

		$(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES)) \

		$(addprefix symbols/,$(PDK_SYMBOL_FILES_LIST))

ifeq (true,$(PLATFORM_ZIP_ADD_JAVA))

	$(hide) cd $(OUT_DIR) && zip -qry $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)

endif
@@ -1221,9 +1230,6 @@ endif 
ifdef BOARD_KERNEL_PAGESIZE

	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize

endif

ifdef BOARD_FORCE_RAMDISK_ADDRESS

	$(hide) echo "$(BOARD_FORCE_RAMDISK_ADDRESS)" > $(zip_root)/BOOT/ramdiskaddr

endif

ifdef ZIP_SAVE_UBOOTIMG_ARGS

	$(hide) echo "$(ZIP_SAVE_UBOOTIMG_ARGS)" > $(zip_root)/BOOT/ubootargs

endif
@@ -1260,6 +1266,7 @@ endif 
ifdef PRODUCT_EXTRA_RECOVERY_KEYS

	$(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt

endif

	$(hide) echo "mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)" >> $(zip_root)/META/misc_info.txt

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

	@# Zip everything up, preserving symlinks

	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
@@ -1303,19 +1310,13 @@ else 
    $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false

endif



ifneq ($(NAM_VARIANT),)

    $(INTERNAL_OTA_PACKAGE_TARGET): modelidcfg := true

else

    $(INTERNAL_OTA_PACKAGE_TARGET): modelidcfg := false

endif



ifeq ($(TARGET_OTA_ASSERT_DEVICE),)

    $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto

else

    $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE)

endif



$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS)

$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"

	$(OTA_FROM_TARGET_SCRIPT) -v \

	   -p $(HOST_OUT) \
@@ -1359,7 +1360,7 @@ else 
    IMG_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT)

endif



$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS)

$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo -e ${CL_YLW}"Package:"${CL_RST}" $@"

	$(IMG_FROM_TARGET_SCRIPT) -v \

	   -s $(extensions) \
@@ -1390,10 +1391,11 @@ BUILT_TESTS_ZIP_PACKAGE := $(intermediates)/$(name).zip 
$(BUILT_TESTS_ZIP_PACKAGE): intermediates := $(intermediates)

$(BUILT_TESTS_ZIP_PACKAGE): zip_root := $(intermediates)/$(name)



# Depending on the images guarantees that the underlying

# directories are up-to-date.

# Depending on the image dependency files, instead of the image files itself,

# guarantees that the underlying directories are up-to-date,

# but don't really build the image.

$(BUILT_TESTS_ZIP_PACKAGE): \

    $(INSTALLED_USERDATAIMAGE_TARGET) \

    $(INTERNAL_USERDATAIMAGE_FILES) \

    | $(ACP)

	@echo -e ${CL_YLW}"Package test files:"${CL_RST} $@"

	$(hide) rm -rf $@ $(zip_root)
@@ -1460,12 +1462,16 @@ $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) 
# A zip of emma code coverage meta files. Generated for fully emma

# instrumented build.

#

ifeq (true,$(EMMA_INSTRUMENT))

EMMA_META_ZIP := $(PRODUCT_OUT)/emma_meta.zip

$(EMMA_META_ZIP): $(INSTALLED_SYSTEMIMAGE)

# the dependency will be set up later in build/core/main.mk.

$(EMMA_META_ZIP) :

	@echo "Collecting Emma coverage meta files."

	$(hide) find $(TARGET_COMMON_OUT_ROOT) -name "coverage.em" | \

		zip -@ -q $@



endif # EMMA_INSTRUMENT=true



# -----------------------------------------------------------------

# dalvik something

.PHONY: dalvikfiles
@@ -1473,7 +1479,7 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES) 


# -----------------------------------------------------------------

# The emulator package



ifeq ($(BUILD_EMULATOR),true)

INTERNAL_EMULATOR_PACKAGE_FILES += \

        $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \

        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
@@ -1489,6 +1495,7 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) 
	@echo -e ${CL_YLW}"Package:"${CL_RST}" $@"

	$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)



endif

# -----------------------------------------------------------------

# Old PDK stuffs, retired

# The pdk package (Platform Development Kit)
@@ -1584,6 +1591,7 @@ deps := \ 
	$(atree_dir)/sdk.atree \

	$(sdk_tools_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

	$(ALL_HOST_INSTALLED_FILES) \

	$(HOST_OUT_EXECUTABLES)/line_endings



INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip
@@ -1608,6 +1616,7 @@ $(INTERNAL_SDK_TARGET): $(deps) 
	done; \

	if [ $$FAIL ]; then exit 1; fi

	$(hide) ( \

		ATREE_STRIP="strip -x" \

		$(HOST_OUT_EXECUTABLES)/atree \

		$(addprefix -f ,$(PRIVATE_INPUT_FILES)) \

			-m $(PRIVATE_DEP_FILE) \
@@ -1663,6 +1672,7 @@ $(INTERNAL_FINDBUGS_HTML_TARGET): $(INTERNAL_FINDBUGS_XML_TARGET) 
# These are some additional build tasks that need to be run.

include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))

-include $(sort $(wildcard vendor/*/build/tasks/*.mk))

-include $(sort $(wildcard device/*/build/tasks/*.mk))



# -----------------------------------------------------------------

# Create SDK repository packages. Must be done after tasks/* since

core/armelf.xsc

deleted100644 → 0
+0 −207
Original line number Diff line number Diff line 
/* Script for --shared -z combreloc: shared library, combine & sort relocs */

OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",

	      "elf32-littlearm")

OUTPUT_ARCH(arm)

ENTRY(_start)

SECTIONS

{

  /* Read-only sections, merged into text segment: */

  . = 0 + SIZEOF_HEADERS;

  .hash           : { *(.hash) }

  .dynsym         : { *(.dynsym) }

  .dynstr         : { *(.dynstr) }

  .gnu.version    : { *(.gnu.version) }

  .gnu.version_d  : { *(.gnu.version_d) }

  .gnu.version_r  : { *(.gnu.version_r) }

  .rel.dyn        :

    {

      *(.rel.init)

      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)

      *(.rel.fini)

      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)

      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)

      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)

      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)

      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)

      *(.rel.ctors)

      *(.rel.dtors)

      *(.rel.got)

      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)

    }

  .rela.dyn       :

    {

      *(.rela.init)

      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)

      *(.rela.fini)

      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)

      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)

      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)

      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)

      *(.rela.ctors)

      *(.rela.dtors)

      *(.rela.got)

      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)

    }

  .rel.plt        : { *(.rel.plt) }

  .rela.plt       : { *(.rela.plt) }

  .init           :

  {

    KEEP (*(.init))

  } =0

  .plt            : { *(.plt) }

  .text           :

  {

    *(.text .stub .text.* .gnu.linkonce.t.*)

    KEEP (*(.text.*personality*))

    /* .gnu.warning sections are handled specially by elf32.em.  */

    *(.gnu.warning)

    *(.glue_7t) *(.glue_7)

  } =0

  .fini           :

  {

    KEEP (*(.fini))

  } =0

  PROVIDE (__etext = .);

  PROVIDE (_etext = .);

  PROVIDE (etext = .);

  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }

  .rodata1        : { *(.rodata1) }

  /* We have to wrap extab and exidx sections with KEEP because we use

     --gc-sections. */

  .ARM.extab   : { KEEP (*(.ARM.extab* .gnu.linkonce.armextab.*)) }

   __exidx_start = .;

  .ARM.exidx   : { KEEP (*(.ARM.exidx* .gnu.linkonce.armexidx.*)) }

   __exidx_end = .;

  .eh_frame_hdr : { *(.eh_frame_hdr) }

  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }

  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }

  /* Adjust the address for the data segment.  We want to align at exactly

     a page boundary to make life easier for apriori. */

  . = ALIGN(4096);

  /* Exception handling  */

  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }

  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }

  /* Thread Local Storage sections  */

  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }

  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }

  .preinit_array     :

  {

    KEEP (*(.preinit_array))

  }

  .init_array     :

  {

     KEEP (*(SORT(.init_array.*)))

     KEEP (*(.init_array))

  }

  .fini_array     :

  {

    KEEP (*(.fini_array))

    KEEP (*(SORT(.fini_array.*)))

  }

  .ctors          :

  {

    /* gcc uses crtbegin.o to find the start of

       the constructors, so we make sure it is

       first.  Because this is a wildcard, it

       doesn't matter if the user does not

       actually link against crtbegin.o; the

       linker won't look for a file to match a

       wildcard.  The wildcard also means that it

       doesn't matter which directory crtbegin.o

       is in.  */

    KEEP (*crtbegin*.o(.ctors))

    /* We don't want to include the .ctor section from

       the crtend.o file until after the sorted ctors.

       The .ctor section from the crtend file contains the

       end of ctors marker and it must be last */

    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))

    KEEP (*(SORT(.ctors.*)))

    KEEP (*(.ctors))

  }

  .dtors          :

  {

    KEEP (*crtbegin*.o(.dtors))

    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))

    KEEP (*(SORT(.dtors.*)))

    KEEP (*(.dtors))

  }

  .jcr            : { KEEP (*(.jcr)) }

  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }

  .dynamic        : { *(.dynamic) }

  .got            : { *(.got.plt) *(.got) }

  .data           :

  {

    __data_start = . ;

    *(.data .data.* .gnu.linkonce.d.*)

    KEEP (*(.gnu.linkonce.d.*personality*))

    SORT(CONSTRUCTORS)

  }

  .data1          : { *(.data1) }

  _edata = .; PROVIDE (edata = .);

  __bss_start = .;

  __bss_start__ = .;

  .bss            :

  {

   *(.dynbss)

   *(.bss .bss.* .gnu.linkonce.b.*)

   *(COMMON)

   /* Align here to ensure that the .bss section occupies space up to

      _end.  Align after .bss to ensure correct alignment even if the

      .bss section disappears because there are no input sections.

      FIXME: Why do we need it? When there is no .bss section, we don't

      pad the .data section.  */

   . = ALIGN(. != 0 ? 32 / 8 : 1);

  }

  _bss_end__ = . ; __bss_end__ = . ;

  . = ALIGN(32 / 8);

  . = ALIGN(32 / 8);

  __end__ = . ;

  _end = .; PROVIDE (end = .);

  /* Stabs debugging sections.  */

  .stab          0 : { *(.stab) }

  .stabstr       0 : { *(.stabstr) }

  .stab.excl     0 : { *(.stab.excl) }

  .stab.exclstr  0 : { *(.stab.exclstr) }

  .stab.index    0 : { *(.stab.index) }

  .stab.indexstr 0 : { *(.stab.indexstr) }

  .comment       0 : { *(.comment) }

  /* DWARF debug sections.

     Symbols in the DWARF debugging sections are relative to the beginning

     of the section so we begin them at 0.  */

  /* DWARF 1 */

  .debug          0 : { *(.debug) }

  .line           0 : { *(.line) }

  /* GNU DWARF 1 extensions */

  .debug_srcinfo  0 : { *(.debug_srcinfo) }

  .debug_sfnames  0 : { *(.debug_sfnames) }

  /* DWARF 1.1 and DWARF 2 */

  .debug_aranges  0 : { *(.debug_aranges) }

  .debug_pubnames 0 : { *(.debug_pubnames) }

  /* DWARF 2 */

  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }

  .debug_abbrev   0 : { *(.debug_abbrev) }

  .debug_line     0 : { *(.debug_line) }

  .debug_frame    0 : { *(.debug_frame) }

  .debug_str      0 : { *(.debug_str) }

  .debug_loc      0 : { *(.debug_loc) }

  .debug_macinfo  0 : { *(.debug_macinfo) }

  /* SGI/MIPS DWARF 2 extensions */

  .debug_weaknames 0 : { *(.debug_weaknames) }

  .debug_funcnames 0 : { *(.debug_funcnames) }

  .debug_typenames 0 : { *(.debug_typenames) }

  .debug_varnames  0 : { *(.debug_varnames) }

  /* Adding the word ABSOLUTE below, so that the _stack below won't float

     into a random section. If _stack is not absolutely with .stack section,

     we saw that sometimes _stack got inserted into the .debug_frame section

     because it's processed by the linker at that moment. As a result, _stack

     symbol will get wrongly moved and gelf_update_symshndx() will return

     invalid data. */

    .stack         0x80000 :

  {

    _stack = ABSOLUTE(.);

    *(.stack)

  }

  .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }

  .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) }

  /DISCARD/ : { *(.note.GNU-stack) }

}

core/base_rules.mk

+48 −63

File changed.

Preview size limit exceeded, changes collapsed.

core/binary.mk

+44 −46

File changed.

Preview size limit exceeded, changes collapsed.