Skip to content

Commit

Permalink
Merge branch 'master' into page-access-trace
Browse files Browse the repository at this point in the history
  • Loading branch information
rlyerly committed Jan 11, 2018
2 parents 3d5ad67 + 83468b3 commit f9a26bf
Show file tree
Hide file tree
Showing 200 changed files with 100,177 additions and 1,418 deletions.
55 changes: 55 additions & 0 deletions install_compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,61 @@ def install_libraries(base_path, install_path, targets, num_threads, st_debug,

os.chdir(cur_dir)

#=====================================================
# CONFIGURE & INSTALL LIBOPENPOP
#=====================================================
os.chdir(os.path.join(base_path, 'lib/libopenpop'))
if os.path.isfile('Makefile'):
try:
rv = subprocess.check_call(['make', 'distclean'])
except Exception as e:
print('ERROR running distclean!')
sys.exit(1)
else:
if rv != 0:
print('Make distclean failed.')
sys.exit(1)

print("Configuring libopenpop ({})...".format(target))
try:
# TODO -popcorn-alignment -> -popcorn-migratable
os.environ['CC'] = '{}/bin/clang'.format(install_path)
os.environ['CFLAGS'] = '-target {}-linux-gnu \
-nostdinc -isystem {}/include \
-popcorn-alignment'\
.format(target, target_install_path)
args = ['./configure',
'--prefix=' + target_install_path,
'--target={}-linux-gnu'.format(target),
'--host={}-linux-gnu'.format(target),
'--enable-static',
'--disable-shared']
rv = subprocess.check_call(args, stderr=subprocess.STDOUT, shell=False)
del os.environ['CC']
del os.environ['CFLAGS']
except Exception as e:
print('Could not configure libopenpop ({})!'.format(e))
sys.exit(1)
else:
if rv != 0:
print('libopenpop configure failed.')
sys.exit(1)

print('Making libopenpop...')
try:
print('Running Make...')
rv = subprocess.check_call(['make', '-j', str(num_threads)])
rv = subprocess.check_call(['make', 'install'])
except Exception as e:
print('Could not run Make ({})!'.format(e))
sys.exit(1)
else:
if rv != 0:
print('Make failed.')
sys.exit(1)

os.chdir(cur_dir)

# The build systems for the following already build for all ISAs

#=====================================================
Expand Down
7 changes: 0 additions & 7 deletions lib/libbomp/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions lib/libbomp/Copyright

This file was deleted.

29 changes: 0 additions & 29 deletions lib/libbomp/INSTALL

This file was deleted.

84 changes: 0 additions & 84 deletions lib/libbomp/Makefile

This file was deleted.

53 changes: 0 additions & 53 deletions lib/libbomp/README

This file was deleted.

22 changes: 0 additions & 22 deletions lib/libbomp/backend.h

This file was deleted.

60 changes: 0 additions & 60 deletions lib/libbomp/libbomp.h

This file was deleted.

0 comments on commit f9a26bf

Please sign in to comment.