Author: dgilmore
Date: 2011-03-22 19:32:46 -0400 (Tue, 22 Mar 2011)
New Revision: 3524
Modified:
trunk/osprey/libhugetlbfs/elflink.c
Log:
It appears that omnetpp is in some cases failing with failing commit
r3516 when omnetpp is build with hugepages.
This commit reverses the patch for commit r3516.
Modified: trunk/osprey/libhugetlbfs/elflink.c
===================================================================
--- trunk/osprey/libhugetlbfs/elflink.c 2011-03-22 20:31:26 UTC (rev 3523)
+++ trunk/osprey/libhugetlbfs/elflink.c 2011-03-22 23:32:46 UTC (rev 3524)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 Advanced Micro Devices, Inc. All Rights Reserved.
+ * Copyright (C) 2008-2010 Advanced Micro Devices, Inc. All Rights Reserved.
*/
/*
@@ -681,29 +681,9 @@
if (save_phdr(htlb_num_segs, i, &info->dlpi_phdr[i]))
return 1;
-
-#ifdef OPEN64_MOD
- if (info->dlpi_phdr[i].p_flags & PF_W) {
- struct seg_info *seg = &htlb_seg_table[htlb_num_segs];
- void *cur_brk = sbrk(0);
- void *end_addr = seg->vaddr + seg->memsz;
- if (end_addr != cur_brk) {
- seg->extrasz = (cur_brk - seg->vaddr) -
seg->filesz;
- DEBUG("memory already allocated: end_addr=%p,
cur_brk=%p\n",
- end_addr, cur_brk);
- }
- /* No need to call get_extracopy, since we know we
already need
- * to copy past the address of any symbol that is in
the dynamic
- * symbol table.
- */
- } else {
- get_extracopy(&htlb_seg_table[htlb_num_segs],
- &info->dlpi_phdr[0], info->dlpi_phnum);
- }
-#else
get_extracopy(&htlb_seg_table[htlb_num_segs],
&info->dlpi_phdr[0], info->dlpi_phnum);
-#endif
+
htlb_num_segs++;
}
if (__hugetlbfs_debug)
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel
